diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/BaseStyleDecorator.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/Decorators/BaseStyleDecorator.cs
similarity index 100%
rename from src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/BaseStyleDecorator.cs
rename to src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/Decorators/BaseStyleDecorator.cs
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportContainer.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportContainer.cs
index 68719ceab6..02f51f560d 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportContainer.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportContainer.cs
@@ -18,6 +18,7 @@ namespace SharpReportCore.Exporters
 	{
 
 		ExporterCollection<BaseExportColumn> items;
+		
 		public ExportContainer():base(){
 			base.IsContainer = true;
 		}
@@ -41,6 +42,5 @@ namespace SharpReportCore.Exporters
 				return items;
 			}
 		}
-		
 	}
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportGraphic.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportGraphic.cs
index d2324bb58d..ed961f0f9b 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportGraphic.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportGraphic.cs
@@ -33,14 +33,11 @@ namespace SharpReportCore.Exporters
 			                 style.DisplayRectangle);
 		}
 		
-//		public override BaseStyleDecorator StyleDecorator {
-//			get {
-//				return base.StyleDecorator as GraphicStyleDecorator;
-//			}
-//			set {
-//				base.StyleDecorator = value;
-//			}
-//		}
-	
+		public new GraphicStyleDecorator StyleDecorator {
+			get{
+				return base.StyleDecorator as GraphicStyleDecorator;
+			}
+		}
+
 	}
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportText.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportText.cs
index 20a63aacbe..fa360633d4 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportText.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/ExportText.cs
@@ -33,9 +33,9 @@ namespace SharpReportCore.Exporters {
 			}
 		}
 		
-		public override BaseStyleDecorator StyleDecorator {
+		public new TextStyleDecorator StyleDecorator {
 			get {
-				return base.StyleDecorator;
+				return base.StyleDecorator as TextStyleDecorator;
 			}
 			set {
 				base.StyleDecorator = value;
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/IExportColumnBuilder .cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/IExportColumnBuilder .cs
index f3c96c7743..53e15ff467 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/IExportColumnBuilder .cs	
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exporter/ExportColumns/IExportColumnBuilder .cs	
@@ -19,11 +19,5 @@ namespace SharpReportCore
 	public interface IExportColumnBuilder{
 		BaseExportColumn CreateExportColumn (Graphics graphics);
 	}
-	/*
-	public interface IPerformLine{
-		BaseStyleDecorator StyleDecorator {
-			get;set;
-		}
-	}
-	*/
+
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
index 445a4f8fdc..8f2e06e71e 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
@@ -139,7 +139,6 @@
     <Compile Include="Printing\MeasurementService.cs" />
     <Compile Include="Exporter\SinglePage.cs" />
     <Compile Include="Exporter\PageBuilder.cs" />
-    <Compile Include="Exporter\BaseStyleDecorator.cs" />
     <Compile Include="Exporter\ExportItemsConverter.cs" />
     <Compile Include="Exceptions\MissingDataManagerException.cs" />
     <Compile Include="Exporter\ExportColumns\BaseExportColumn.cs" />
@@ -157,6 +156,7 @@
     <Compile Include="Exporter\ExportColumns\ExportGraphic.cs" />
     <Compile Include="Exporter\Decorators\TextStyleDecorator.cs" />
     <Compile Include="Exporter\Decorators\GraphicStyleDecorator.cs" />
+    <Compile Include="Exporter\Decorators\BaseStyleDecorator.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="BaseItems" />