diff --git a/.themes/classic/sass/base/_solarized.scss b/.themes/classic/sass/base/_solarized.scss
index 30cceb8..8903887 100644
--- a/.themes/classic/sass/base/_solarized.scss
+++ b/.themes/classic/sass/base/_solarized.scss
@@ -4,8 +4,8 @@ $base01:          #586e75 !default; //darkest gray
 $base00:          #657b83 !default; //dark gray
 $base0:           #839496 !default; //medium gray
 $base1:           #93a1a1 !default; //medium light gray
-$base2:           #eee8d5 !default; //cream
-$base3:           #fdf6e3 !default; //white
+$base2:           #f2f2f2 !default; //cream
+$base3:           #ffffff !default; //white
 $solar-yellow:    #b58900 !default;
 $solar-orange:    #cb4b16 !default;
 $solar-red:       #dc322f !default;
@@ -18,17 +18,29 @@ $solar-green:     #859900 !default;
 $solarized: dark !default;
 
 @if $solarized == light {
-  $base03: #fdf6e3;
-  $base02: #eee8d5;
-  $base01: #93a1a1;
-  $base00: #839496;
-  $base0:  #657b83;
-  $base1:  #586e75;
-  $base2:  #073642;
-  $base3:  #002b36;
+
+  $_base03: $base03;
+  $_base02: $base02;
+  $_base01: $base01;
+  $_base00: $base00;
+  $_base0:  $base0;
+  $_base1:  $base1;
+  $_base2:  $base2;
+  $_base3:  $base3;
+
+  $base03:  $_base3;
+  $base02:  $_base2;
+  $base01:  $_base1;
+  $base00:  $_base0;
+  $base0:   $_base00;
+  $base1:   $_base01;
+  $base2:   $_base02;
+  $base3:   $_base03;
 }
 
 /* non highlighted code colors */
 $pre-bg: $base03 !default;
-$pre-border: $base02 !default;
+$pre-border: darken($base02, 5) !default;
 $pre-color: $base1 !default;
+
+
diff --git a/.themes/classic/sass/custom/_colors.scss b/.themes/classic/sass/custom/_colors.scss
index 9a34404..cf0ab29 100644
--- a/.themes/classic/sass/custom/_colors.scss
+++ b/.themes/classic/sass/custom/_colors.scss
@@ -11,7 +11,7 @@
 
 
 /* To use the light Solarized highlighting theme uncomment the following line */
-//$solarized: light
+//$solarized: light;
 
 /* If you want to tweak the Solarized colors you can do that here */
 //$base03:          #002b36; //darkest blue
@@ -34,5 +34,5 @@
 
 /* Non highlighted code colors */
 //$pre-bg: $base03;
-//$pre-border: $base02;
+//$pre-border: darken($base02, 5);
 //$pre-color: $base1;
diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index 2ae6164..77ac8d7 100644
--- a/.themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
@@ -21,17 +21,19 @@
   }
   border: 1px solid $pre-border !important;
 }
+figure.code, .gist-file, pre {
+  @include box-shadow(rgba(#000, .06) 0 0 10px);
+  .highlight pre { @include box-shadow(none); }
+}
+
 html .gist .gist-file {
   margin-bottom: 1.8em;
   position: relative;
   border: none;
   padding-top: image-height("code_bg.png") !important;
   .gist-syntax {
-    @if $solarized == dark {
-      border-bottom: 1px solid $base03 !important;
-    } @else if $solarized == light {
-      border-bottom: 0px;
-    }
+    border-bottom: 0 !important;
+    background: none !important;
     .gist-highlight{
       background: $base03 !important;
       pre {
@@ -46,6 +48,7 @@ html .gist .gist-file {
    font-size: .7em !important;
    @if $solarized == light {
      background: lighten($base03, 2) $noise-bg;
+     border: 1px solid $pre-border !important;
      border-top: 1px solid lighten($base03, 2) !important;
    } @else {
      background: $base02 $noise-bg;