Index: src/Common/SharpMap/Rendering/Thematics/Theme.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a
--- src/Common/SharpMap/Rendering/Thematics/Theme.cs	(.../Theme.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap/Rendering/Thematics/Theme.cs	(.../Theme.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
@@ -8,43 +8,35 @@
 
 namespace SharpMap.Rendering.Thematics
 {
-    [Entity(FireOnCollectionChange=false)]
+    [Entity(FireOnCollectionChange = false)]
     public abstract class Theme : ITheme
     {
-        public abstract IStyle GetStyle(IFeature feature);
-
-        public abstract IStyle GetStyle<T>(T value) where T : IComparable<T>, IComparable;
-
-        public abstract object Clone();
-
-        public virtual string AttributeName { get; set; }
-
-        public abstract void ScaleTo(double min, double max);
-
         protected Color NoDataColor = Pens.Transparent.Color;
 
         [NoNotifyPropertyChange]
         protected IList noDataValues;
 
+        protected IEventedList<IThemeItem> themeItems;
+
+        protected Theme()
+        {
+            ThemeItems = new EventedList<IThemeItem>();
+        }
+
         public IList NoDataValues
         {
             get
             {
                 return noDataValues;
-            } 
+            }
             set
             {
                 noDataValues = value;
             }
         }
 
-        protected IEventedList<IThemeItem> themeItems;
+        public virtual string AttributeName { get; set; }
 
-        protected Theme()
-        {
-            ThemeItems = new EventedList<IThemeItem>();
-        }
-
         public virtual IEventedList<IThemeItem> ThemeItems
         {
             get
@@ -56,11 +48,7 @@
                 themeItems = value;
             }
         }
-        
-        // ADDED ONLY FOR PERFORMANCE
-        // todo move to quantitytheme and categorialtheme ?
-        public abstract Color GetFillColor<T>(T value) where T : IComparable;
-        
+
         /// <summary>
         /// Fills array of colors based on current configuration of theme.
         /// Used for grid coverages.
@@ -81,5 +69,17 @@
                 colors[i] = GetFillColor(values[i]).ToArgb();
             }
         }
+
+        public abstract IStyle GetStyle(IFeature feature);
+
+        public abstract IStyle GetStyle<T>(T value) where T : IComparable<T>, IComparable;
+
+        public abstract object Clone();
+
+        public abstract void ScaleTo(double min, double max);
+
+        // ADDED ONLY FOR PERFORMANCE
+        // todo move to quantitytheme and categorialtheme ?
+        public abstract Color GetFillColor<T>(T value) where T : IComparable;
     }
-}
+}
\ No newline at end of file