diff --git a/src/Cutout/Cutout.js b/src/Cutout/Cutout.js
index eaa18b87..c0585c29 100644
--- a/src/Cutout/Cutout.js
+++ b/src/Cutout/Cutout.js
@@ -31,7 +31,8 @@ export const StyledCutout = styled.div`
     border-bottom-color: ${({ theme }) => theme.borderLight};
 
     pointer-events: none;
-    ${props => props.shadow && `box-shadow:${insetShadow};`}
+    ${props =>
+      props.theme.shadow && props.shadow && `box-shadow:${insetShadow};`}
   }
 `;
 
diff --git a/src/common/index.js b/src/common/index.js
index 1ab65ee1..fa148cc4 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -64,8 +64,9 @@ export const createBorderStyles = ({
         border-top-color: ${({ theme }) => theme.borderDarkest};
         border-right-color: ${({ theme }) => theme.borderLightest};
         border-bottom-color: ${({ theme }) => theme.borderLightest};
-        box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
-            1px ${({ theme }) => theme.borderDark},
+        box-shadow: ${props =>
+              props.theme.shadow && props.shadow && `${shadow}, `}
+            inset 1px 1px 0px 1px ${({ theme }) => theme.borderDark},
           inset -1px -1px 0 1px ${({ theme }) => theme.borderLight};
       `
     : css`
@@ -77,8 +78,9 @@ export const createBorderStyles = ({
           windowBorders ? theme.borderLight : theme.borderLightest};
         border-right-color: ${({ theme }) => theme.borderDarkest};
         border-bottom-color: ${({ theme }) => theme.borderDarkest};
-        box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
-            1px
+        box-shadow: ${props =>
+              props.theme.shadow && props.shadow && `${shadow}, `}
+            inset 1px 1px 0px 1px
             ${({ theme }) =>
               windowBorders ? theme.borderLightest : theme.borderLight},
           inset -1px -1px 0 1px ${({ theme }) => theme.borderDark};
diff --git a/src/common/themes/aiee.js b/src/common/themes/aiee.js
index b01661a7..a7e8d0cc 100644
--- a/src/common/themes/aiee.js
+++ b/src/common/themes/aiee.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(250,254,255)',
   materialTextInvert: 'rgb(0,62,109)',
   progress: 'rgb(251,211,61)',
+  shadow: true,
   tooltip: 'rgb(255,243,185)'
 };
diff --git a/src/common/themes/ash.js b/src/common/themes/ash.js
index 1173fb5e..98704dad 100644
--- a/src/common/themes/ash.js
+++ b/src/common/themes/ash.js
@@ -33,5 +33,6 @@ export default {
   materialTextDisabledShadow: 'rgb(175, 175, 175)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 0, 0)',
+  shadow: true,
   tooltip: 'rgb(0, 0, 0)'
 };
diff --git a/src/common/themes/azureOrange.js b/src/common/themes/azureOrange.js
index a197f436..c58fb59e 100644
--- a/src/common/themes/azureOrange.js
+++ b/src/common/themes/azureOrange.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#7ebfff',
   materialTextInvert: '#000000',
   progress: '#F46036',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/bee.js b/src/common/themes/bee.js
index 22e2d339..ec6dab48 100644
--- a/src/common/themes/bee.js
+++ b/src/common/themes/bee.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#f8df6e',
   materialTextInvert: '#ffffff',
   progress: '#0C1618',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/blackAndWhite.js b/src/common/themes/blackAndWhite.js
index f212234a..5a6d9ba6 100644
--- a/src/common/themes/blackAndWhite.js
+++ b/src/common/themes/blackAndWhite.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#000000',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/blue.js b/src/common/themes/blue.js
index fac0c68b..15d25870 100644
--- a/src/common/themes/blue.js
+++ b/src/common/themes/blue.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(211, 228, 248)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(51, 153, 255)',
+  shadow: true,
   tooltip: 'rgb(225, 225, 255)'
 };
diff --git a/src/common/themes/brick.js b/src/common/themes/brick.js
index 4aa02950..137ec81f 100644
--- a/src/common/themes/brick.js
+++ b/src/common/themes/brick.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#8e0101',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/candy.js b/src/common/themes/candy.js
index 7f18fab5..7e3eeae6 100644
--- a/src/common/themes/candy.js
+++ b/src/common/themes/candy.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#EFF1F3',
   materialTextInvert: '#EFF1F3',
   progress: '#256EFF',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/cherry.js b/src/common/themes/cherry.js
index 1ef0a8c2..f6fac17d 100644
--- a/src/common/themes/cherry.js
+++ b/src/common/themes/cherry.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(255, 255, 255)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(106, 10, 36)',
+  shadow: true,
   tooltip: 'rgb(225, 254, 255)'
 };
diff --git a/src/common/themes/coldGray.js b/src/common/themes/coldGray.js
index 70955785..21b42241 100644
--- a/src/common/themes/coldGray.js
+++ b/src/common/themes/coldGray.js
@@ -31,5 +31,6 @@ export default {
   materialTextDisabledShadow: '#c7c7df',
   materialTextInvert: '#c7c7df',
   progress: '#8d88c2',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/counterStrike.js b/src/common/themes/counterStrike.js
index 24a1f863..7830f4f2 100644
--- a/src/common/themes/counterStrike.js
+++ b/src/common/themes/counterStrike.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#788475',
   materialTextInvert: '#fefefe',
   progress: '#978830',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/darkTeal.js b/src/common/themes/darkTeal.js
index 3e6aaef7..22ef5612 100644
--- a/src/common/themes/darkTeal.js
+++ b/src/common/themes/darkTeal.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(88, 139, 139)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 128, 128)',
+  shadow: true,
   tooltip: 'rgb(0, 32, 32)'
 };
diff --git a/src/common/themes/denim.js b/src/common/themes/denim.js
index b2782a0f..c455da00 100644
--- a/src/common/themes/denim.js
+++ b/src/common/themes/denim.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(191, 191, 255)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(10, 36, 106)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/themes/eggplant.js b/src/common/themes/eggplant.js
index 739d5dd6..92b546f1 100644
--- a/src/common/themes/eggplant.js
+++ b/src/common/themes/eggplant.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#cee8e3',
   materialTextInvert: '#ffffff',
   progress: '#4b8178',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/fxDev.js b/src/common/themes/fxDev.js
index 205eea4b..cdb63c5a 100644
--- a/src/common/themes/fxDev.js
+++ b/src/common/themes/fxDev.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(107, 113, 122)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(7, 77, 117)',
+  shadow: true,
   tooltip: 'rgb(243, 242, 219)'
 };
diff --git a/src/common/themes/highContrast.js b/src/common/themes/highContrast.js
index de7dd0a2..61ae179b 100644
--- a/src/common/themes/highContrast.js
+++ b/src/common/themes/highContrast.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#8e0284',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/honey.js b/src/common/themes/honey.js
index 2f4a1d35..05c2e590 100644
--- a/src/common/themes/honey.js
+++ b/src/common/themes/honey.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(255, 220, 128)',
   materialTextInvert: 'rgb(255, 255, 0)',
   progress: 'rgb(170, 123, 0)',
+  shadow: true,
   tooltip: 'rgb(255, 220, 128)'
 };
diff --git a/src/common/themes/hotChocolate.js b/src/common/themes/hotChocolate.js
index 8f1d0509..712dc993 100644
--- a/src/common/themes/hotChocolate.js
+++ b/src/common/themes/hotChocolate.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(219, 200, 181)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(128, 96, 64)',
+  shadow: true,
   tooltip: 'rgb(219, 200, 181)'
 };
diff --git a/src/common/themes/hotdogStand.js b/src/common/themes/hotdogStand.js
index 0ce38537..077a994f 100644
--- a/src/common/themes/hotdogStand.js
+++ b/src/common/themes/hotdogStand.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(0, 0, 0)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 0, 0)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/themes/lilac.js b/src/common/themes/lilac.js
index 8a88080e..6025fa4c 100644
--- a/src/common/themes/lilac.js
+++ b/src/common/themes/lilac.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#5e4dba',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/lilacRoseDark.js b/src/common/themes/lilacRoseDark.js
index 3474744c..8bfef08a 100644
--- a/src/common/themes/lilacRoseDark.js
+++ b/src/common/themes/lilacRoseDark.js
@@ -31,5 +31,6 @@ export default {
   materialTextDisabledShadow: '#ecbfe3',
   materialTextInvert: '#ecbfe3',
   progress: '#713259',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/maple.js b/src/common/themes/maple.js
index 7974825c..938ee1a3 100644
--- a/src/common/themes/maple.js
+++ b/src/common/themes/maple.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#8e0101',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/marine.js b/src/common/themes/marine.js
index 5d33055a..deb74eec 100644
--- a/src/common/themes/marine.js
+++ b/src/common/themes/marine.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#000080',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/matrix.js b/src/common/themes/matrix.js
index 476b3de0..57f8885d 100644
--- a/src/common/themes/matrix.js
+++ b/src/common/themes/matrix.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#a7a7a7',
   materialTextInvert: '#ffffff',
   progress: '#000000',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/millenium.js b/src/common/themes/millenium.js
index ad3d6e58..de9653b7 100644
--- a/src/common/themes/millenium.js
+++ b/src/common/themes/millenium.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#00256e',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/modernDark.js b/src/common/themes/modernDark.js
index 58633087..d9459e5f 100644
--- a/src/common/themes/modernDark.js
+++ b/src/common/themes/modernDark.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#121317',
   materialTextInvert: '#202127',
   progress: '#f88702',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/molecule.js b/src/common/themes/molecule.js
index 7ae8da55..e8371fe8 100644
--- a/src/common/themes/molecule.js
+++ b/src/common/themes/molecule.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#d79099',
   materialTextInvert: '#f1f5f6',
   progress: '#a03d49',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/monochrome.js b/src/common/themes/monochrome.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/common/themes/ninjaTurtles.js b/src/common/themes/ninjaTurtles.js
index 0fd91616..45b816e4 100644
--- a/src/common/themes/ninjaTurtles.js
+++ b/src/common/themes/ninjaTurtles.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#55fd55',
   materialTextInvert: '#000000',
   progress: '#FF1D15',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/olive.js b/src/common/themes/olive.js
index b5d79a43..e9c89e74 100644
--- a/src/common/themes/olive.js
+++ b/src/common/themes/olive.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#fcfd3e',
   materialTextInvert: '#000000',
   progress: '#F3DE2C',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/original.js b/src/common/themes/original.js
index f52352fa..aff2df33 100644
--- a/src/common/themes/original.js
+++ b/src/common/themes/original.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#fefefe',
   materialTextInvert: '#fefefe',
   progress: '#060084',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/pamelaAnderson.js b/src/common/themes/pamelaAnderson.js
index 0e7667c3..074d95d4 100644
--- a/src/common/themes/pamelaAnderson.js
+++ b/src/common/themes/pamelaAnderson.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ff7ebf',
   materialTextInvert: '#F1E4E8',
   progress: '#004FFF',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/peggysPastels.js b/src/common/themes/peggysPastels.js
index cf05f3e2..c2b8348f 100644
--- a/src/common/themes/peggysPastels.js
+++ b/src/common/themes/peggysPastels.js
@@ -37,4 +37,7 @@ const theme = {
   WindowText: 'rgb(0, 0, 0)'
 };
 
-export default mapFromWindowsTheme('peggysPastels', theme, true);
+export default mapFromWindowsTheme('peggysPastels', theme, {
+  useGradients: true,
+  useShadows: true
+});
diff --git a/src/common/themes/plum.js b/src/common/themes/plum.js
index 2d95ddea..65a6e4bc 100644
--- a/src/common/themes/plum.js
+++ b/src/common/themes/plum.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#e8dad6',
   materialTextInvert: '#ffffff',
   progress: '#483f63',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/polarized.js b/src/common/themes/polarized.js
index 6361bee6..bbbb9a8c 100644
--- a/src/common/themes/polarized.js
+++ b/src/common/themes/polarized.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(60, 60, 194)',
   materialTextInvert: 'rgb(0, 0, 255)',
   progress: 'rgb(192, 192, 64)',
+  shadow: true,
   tooltip: 'rgb(16, 16, 240)'
 };
diff --git a/src/common/themes/powerShell.js b/src/common/themes/powerShell.js
index 461d3d38..69b3fc97 100644
--- a/src/common/themes/powerShell.js
+++ b/src/common/themes/powerShell.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(128, 128, 128)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 128, 128)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/themes/rainyDay.js b/src/common/themes/rainyDay.js
index b61581ae..ac7086a2 100644
--- a/src/common/themes/rainyDay.js
+++ b/src/common/themes/rainyDay.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#b7cee5',
   materialTextInvert: '#ffffff',
   progress: '#4b6480',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/raspberry.js b/src/common/themes/raspberry.js
index cef186cb..2bdfa9b6 100644
--- a/src/common/themes/raspberry.js
+++ b/src/common/themes/raspberry.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(200, 204, 206)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(10, 36, 106)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/themes/redWine.js b/src/common/themes/redWine.js
index be4f46f2..8d81f518 100644
--- a/src/common/themes/redWine.js
+++ b/src/common/themes/redWine.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(192, 64, 56)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(192, 0, 0)',
+  shadow: true,
   tooltip: 'rgb(64, 0, 0)'
 };
diff --git a/src/common/themes/rose.js b/src/common/themes/rose.js
index b51de610..a110f0b8 100644
--- a/src/common/themes/rose.js
+++ b/src/common/themes/rose.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#f1d4dc',
   materialTextInvert: '#ffffff',
   progress: '#ab5a71',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/seawater.js b/src/common/themes/seawater.js
index 37c351b1..b4587be3 100644
--- a/src/common/themes/seawater.js
+++ b/src/common/themes/seawater.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(167, 194, 224)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 128, 128)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/themes/shelbiTeal.js b/src/common/themes/shelbiTeal.js
index 88d88729..bc4ba86a 100644
--- a/src/common/themes/shelbiTeal.js
+++ b/src/common/themes/shelbiTeal.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(204, 224, 224)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 128, 128)',
+  shadow: true,
   tooltip: 'rgb(224, 255, 255)'
 };
diff --git a/src/common/themes/slate.js b/src/common/themes/slate.js
index d40bd159..bf92f8d5 100644
--- a/src/common/themes/slate.js
+++ b/src/common/themes/slate.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#c3d9e9',
   materialTextInvert: '#f2ffff',
   progress: '#448199',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/solarizedDark.js b/src/common/themes/solarizedDark.js
index 46c08f17..ff2897aa 100644
--- a/src/common/themes/solarizedDark.js
+++ b/src/common/themes/solarizedDark.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(0, 43, 54)',
   materialTextInvert: 'rgb(238, 232, 213)',
   progress: 'rgb(211, 54, 130)',
+  shadow: true,
   tooltip: 'rgb(253, 246, 227)'
 };
diff --git a/src/common/themes/solarizedLight.js b/src/common/themes/solarizedLight.js
index 3b4e8c82..5472a83f 100644
--- a/src/common/themes/solarizedLight.js
+++ b/src/common/themes/solarizedLight.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(253, 246, 227)',
   materialTextInvert: 'rgb(238, 232, 213)',
   progress: 'rgb(211, 54, 130)',
+  shadow: true,
   tooltip: 'rgb(253, 246, 227)'
 };
diff --git a/src/common/themes/spruce.js b/src/common/themes/spruce.js
index 6f61807a..5c3dd33e 100644
--- a/src/common/themes/spruce.js
+++ b/src/common/themes/spruce.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#cdead2',
   materialTextInvert: '#fcfff6',
   progress: '#3d9961',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/stormClouds.js b/src/common/themes/stormClouds.js
index 990db4e6..00c29c9d 100644
--- a/src/common/themes/stormClouds.js
+++ b/src/common/themes/stormClouds.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(159, 171, 172)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(128, 128, 0)',
+  shadow: true,
   tooltip: 'rgb(48, 64, 80)'
 };
diff --git a/src/common/themes/theSixtiesUSA.js b/src/common/themes/theSixtiesUSA.js
index 5709372c..a309bb64 100644
--- a/src/common/themes/theSixtiesUSA.js
+++ b/src/common/themes/theSixtiesUSA.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#df9be7',
   materialTextInvert: '#010001',
   progress: '#0f0',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/tokyoDark.js b/src/common/themes/tokyoDark.js
index 9bf6a0d4..a9c24c9c 100644
--- a/src/common/themes/tokyoDark.js
+++ b/src/common/themes/tokyoDark.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#93a0a1',
   materialTextInvert: '#ffffff',
   progress: '#F61067',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/toner.js b/src/common/themes/toner.js
index 873fa68e..4257fe9d 100644
--- a/src/common/themes/toner.js
+++ b/src/common/themes/toner.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(127, 127, 127)',
   materialTextInvert: 'rgb(0, 0, 0)',
   progress: 'rgb(255, 255, 255)',
+  shadow: true,
   tooltip: 'rgb(128, 128, 128)'
 };
diff --git a/src/common/themes/tooSexy.js b/src/common/themes/tooSexy.js
index 31982aa7..e9b2c19e 100644
--- a/src/common/themes/tooSexy.js
+++ b/src/common/themes/tooSexy.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#fe5757',
   materialTextInvert: '#ffffff',
   progress: '#474973',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/travel.js b/src/common/themes/travel.js
index 3f15f05a..858889cb 100644
--- a/src/common/themes/travel.js
+++ b/src/common/themes/travel.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#baae9f',
   materialTextInvert: '#ffffff',
   progress: '#48604f',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/vaporTeal.js b/src/common/themes/vaporTeal.js
index c173bd9f..b41acf97 100644
--- a/src/common/themes/vaporTeal.js
+++ b/src/common/themes/vaporTeal.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#58ffff',
   materialTextInvert: '#000000',
   progress: '#FF99C8',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/vermillion.js b/src/common/themes/vermillion.js
index e94f949e..0a0ed1a7 100644
--- a/src/common/themes/vermillion.js
+++ b/src/common/themes/vermillion.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#e59697',
   materialTextInvert: '#EFE9F4',
   progress: '#000103',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/violetDark.js b/src/common/themes/violetDark.js
index 921a7d86..db5b304a 100644
--- a/src/common/themes/violetDark.js
+++ b/src/common/themes/violetDark.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#c47bcc',
   materialTextInvert: '#c47bcc',
   progress: '#000080',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/vistaesqueMidnight.js b/src/common/themes/vistaesqueMidnight.js
index 514146fe..1bb8ae8d 100644
--- a/src/common/themes/vistaesqueMidnight.js
+++ b/src/common/themes/vistaesqueMidnight.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(128, 128, 128)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(49, 106, 197)',
+  shadow: true,
   tooltip: 'rgb(0, 0, 30)'
 };
diff --git a/src/common/themes/water.js b/src/common/themes/water.js
index 429711c2..58b85dfa 100644
--- a/src/common/themes/water.js
+++ b/src/common/themes/water.js
@@ -30,5 +30,6 @@ export default {
   materialTextDisabledShadow: '#ffffff',
   materialTextInvert: '#ffffff',
   progress: '#72b3b4',
+  shadow: true,
   tooltip: '#fefbcc'
 };
diff --git a/src/common/themes/white.js b/src/common/themes/white.js
index e885b85e..294421bd 100644
--- a/src/common/themes/white.js
+++ b/src/common/themes/white.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(255, 255, 255)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 0, 128)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 128)'
 };
diff --git a/src/common/themes/windows1.js b/src/common/themes/windows1.js
index ffe617ce..40b71d87 100644
--- a/src/common/themes/windows1.js
+++ b/src/common/themes/windows1.js
@@ -34,5 +34,6 @@ export default {
   materialTextDisabledShadow: 'rgb(255, 255, 255)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 0, 0)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 85)'
 };
diff --git a/src/common/themes/wmii.js b/src/common/themes/wmii.js
index 7e7c5eab..d05d2e29 100644
--- a/src/common/themes/wmii.js
+++ b/src/common/themes/wmii.js
@@ -35,5 +35,6 @@ export default {
   materialTextDisabledShadow: 'rgb(224, 225, 198)',
   materialTextInvert: 'rgb(255, 255, 255)',
   progress: 'rgb(0, 0, 0)',
+  shadow: true,
   tooltip: 'rgb(255, 255, 225)'
 };
diff --git a/src/common/utils/index.js b/src/common/utils/index.js
index 7deaad9c..7067224a 100644
--- a/src/common/utils/index.js
+++ b/src/common/utils/index.js
@@ -14,7 +14,11 @@ function linearGradient(left, right) {
   return `linear-gradient(to right, ${left}, ${right})`;
 }
 
-export function mapFromWindowsTheme(name, windowsTheme, useGradients) {
+export function mapFromWindowsTheme(
+  name,
+  windowsTheme,
+  { useGradients, useShadows } = {}
+) {
   /* eslint-disable no-unused-vars */
   const {
     ButtonAlternateFace,
@@ -87,6 +91,7 @@ export function mapFromWindowsTheme(name, windowsTheme, useGradients) {
     materialTextDisabledShadow: ButtonHilight,
     materialTextInvert: HilightText,
     progress: Hilight,
+    shadow: useShadows,
     tooltip: InfoWindow
   };
 }
diff --git a/src/common/utils/index.spec.js b/src/common/utils/index.spec.js
index 9aed50ec..19d2ab6e 100644
--- a/src/common/utils/index.spec.js
+++ b/src/common/utils/index.spec.js
@@ -93,10 +93,16 @@ describe('mapFromWindowsTheme', () => {
       materialTextDisabledShadow: '#000003',
       materialTextInvert: '#00001b',
       progress: '#00001a',
+      shadow: false,
       tooltip: '#00001e'
     };
 
-    expect(mapFromWindowsTheme('theme', theme, false)).toEqual(expectedTheme);
+    expect(
+      mapFromWindowsTheme('theme', theme, {
+        useGradients: false,
+        useShadows: false
+      })
+    ).toEqual(expectedTheme);
   });
 
   it('should map corresponding properties with gradients if gradients are enabled', () => {
@@ -164,10 +170,16 @@ describe('mapFromWindowsTheme', () => {
       materialTextDisabledShadow: '#000003',
       materialTextInvert: '#00001b',
       progress: '#00001a',
+      shadow: true,
       tooltip: '#00001e'
     };
 
-    expect(mapFromWindowsTheme('theme', theme, true)).toEqual(expectedTheme);
+    expect(
+      mapFromWindowsTheme('theme', theme, {
+        useGradients: true,
+        useShadows: true
+      })
+    ).toEqual(expectedTheme);
   });
 });