diff --git a/Xamarin.Forms.NeoControls/NeoFrame.cs b/Xamarin.Forms.NeoControls/NeoFrame.cs
index 74d2f8b..504dab8 100644
--- a/Xamarin.Forms.NeoControls/NeoFrame.cs
+++ b/Xamarin.Forms.NeoControls/NeoFrame.cs
@@ -56,6 +56,7 @@ protected virtual void DrawBorder(RenderContext renderContext, SKPath path)
         {
             renderContext.Paint.Style = SKPaintStyle.Stroke;
             renderContext.Paint.Color = BorderColor.ToSKColor();
+            renderContext.Paint.Shader = null;
             renderContext.Paint.StrokeWidth = Convert.ToSingle(BorderWidth);
             renderContext.Canvas.DrawPath(path, renderContext.Paint);
         }
diff --git a/Xamarin.Forms.NeoControls/NeoView.xaml.cs b/Xamarin.Forms.NeoControls/NeoView.xaml.cs
index 488e454..3ad5bad 100644
--- a/Xamarin.Forms.NeoControls/NeoView.xaml.cs
+++ b/Xamarin.Forms.NeoControls/NeoView.xaml.cs
@@ -162,7 +162,7 @@ protected virtual void OnCanvasViewPaintSurface(object sender, SKPaintSurfaceEve
                 if (drawOuterShadow)
                     DrawOuterShadow(context);
 
-                SetPaintColor(context);
+                //SetPaintColor(context);
                 DrawControl(context);
 
                 if (drawInnerShadow)
@@ -186,6 +186,8 @@ protected virtual void DrawInnerShadow(RenderContext context)
         {
             var fShadowDistance = Convert.ToSingle(ShadowDistance);
             var darkShadow = Color.FromRgba(DarkShadowColor.R, DarkShadowColor.G, DarkShadowColor.B, Elevation);
+            var lightShadow = Color.FromRgba(LightShadowColor.R, LightShadowColor.G, LightShadowColor.B, Elevation);
+
             var drawPadding = ShadowDrawMode == ShadowDrawMode.InnerOnly ?
                 0 : Convert.ToSingle(ShadowBlur * 2);
 
@@ -201,7 +203,7 @@ protected virtual void DrawInnerShadow(RenderContext context)
                 context.Paint.Style = SKPaintStyle.Stroke;
                 context.Paint.StrokeWidth = fShadowDistance;
 
-                context.Paint.ImageFilter = LightShadowColor.ToSKDropShadow(-fShadowDistance);
+                context.Paint.ImageFilter = lightShadow.ToSKDropShadow(-fShadowDistance);
                 context.Canvas.DrawPath(path, context.Paint);
 
                 context.Paint.ImageFilter = darkShadow.ToSKDropShadow(fShadowDistance);
@@ -213,6 +215,7 @@ protected virtual void DrawOuterShadow(RenderContext context)
         {
             var fShadowDistance = Convert.ToSingle(ShadowDistance);
             var darkShadow = Color.FromRgba(DarkShadowColor.R, DarkShadowColor.G, DarkShadowColor.B, Elevation);
+            var lightShadow = Color.FromRgba(LightShadowColor.R, LightShadowColor.G, LightShadowColor.B, Elevation);
             var drawPadding = Convert.ToSingle(ShadowBlur * 2);
 
             context.Paint.MaskFilter = SKMaskFilter.CreateBlur(SKBlurStyle.Normal, Convert.ToSingle(ShadowBlur));
@@ -226,7 +229,7 @@ protected virtual void DrawOuterShadow(RenderContext context)
                 context.Paint.ImageFilter = darkShadow.ToSKDropShadow(fShadowDistance);
                 context.Canvas.DrawPath(path, context.Paint);
 
-                context.Paint.ImageFilter = LightShadowColor.ToSKDropShadow(-fShadowDistance);
+                context.Paint.ImageFilter = lightShadow.ToSKDropShadow(-fShadowDistance);
                 context.Canvas.DrawPath(path, context.Paint);
             }
         }
@@ -247,4 +250,4 @@ private static void OnInnerViewChanged(BindableObject bindable, object oldValue,
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Xamarin.Forms.NeoControls/Xamarin.Forms.NeoControls.csproj b/Xamarin.Forms.NeoControls/Xamarin.Forms.NeoControls.csproj
index 275657e..fe71c99 100644
--- a/Xamarin.Forms.NeoControls/Xamarin.Forms.NeoControls.csproj
+++ b/Xamarin.Forms.NeoControls/Xamarin.Forms.NeoControls.csproj
@@ -19,12 +19,6 @@
     <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="NeoView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\Images\Icon.png">
       <Pack>True</Pack>