diff --git a/src/components/Button/Button.stories.js b/src/components/Button/Button.stories.js
index ff39a66..472879a 100644
--- a/src/components/Button/Button.stories.js
+++ b/src/components/Button/Button.stories.js
@@ -8,17 +8,6 @@ import styled from "styled-components";
 import Button from "./Button";
 export const actions = { onClick: action("onClick") };
 
-const Badge = styled.span`
-  content: "";
-  position: absolute;
-  top: 8px;
-  right: 0;
-  width: 12px;
-  height: 4px;
-  display: inline-block;
-  background: fuchsia;
-  box-shadow: 0 0 4px fuchsia;
-`;
 storiesOf("Button", module)
   // .addDecorator(story => (
   //   <div
@@ -30,12 +19,7 @@ storiesOf("Button", module)
   //     {story()}
   //   </div>
   // ))
-  .add("default", () => (
-    <Button {...actions}>
-      Button
-      <Badge />
-    </Button>
-  ))
+  .add("default", () => <Button {...actions}>default</Button>)
   .add("disabled", () => (
     <Button disabled {...actions}>
       Disabled
diff --git a/src/components/Table/Table.stories.js b/src/components/Table/Table.stories.js
index d38994b..e7e86d6 100644
--- a/src/components/Table/Table.stories.js
+++ b/src/components/Table/Table.stories.js
@@ -11,7 +11,7 @@ import TableDataCell from "./TableDataCell/TableDataCell";
 import Window from "../Window/Window";
 import WindowHeader from "../WindowHeader/WindowHeader";
 import WindowContent from "../WindowContent/WindowContent";
-import Button from "../Button/Button";
+
 class SimpleTable extends React.Component {
   render() {
     return (
diff --git a/src/components/common/index.js b/src/components/common/index.js
index 235886f..d9515ba 100644
--- a/src/components/common/index.js
+++ b/src/components/common/index.js
@@ -4,24 +4,24 @@ import { colors, fontSizes, padding } from "./theme.variables";
 const { bg, light, dark, lightGray, darkGray } = colors;
 
 export const shadow = `4px 4px 10px 0 rgba(0, 0, 0, 0.35)`;
-export const insetShadow = `inset 3px 3px 10px rgba(0, 0, 0, 0.3);`;
+export const insetShadow = `inset 3px 3px 10px rgba(0, 0, 0, 0.3)`;
 
 export const StyledMaterial = styled.div`
   box-sizing: border-box;
   display: inline-block;
 
-  background-color: ${colors.bg};
+  background-color: ${bg};
 `;
 export const createDisabledTextStyles = () => `
-  color: ${colors.darkGray};
-  text-shadow: 1px 1px ${colors.light};
+  color: ${darkGray};
+  text-shadow: 1px 1px ${light};
   filter: grayscale(100%);
 `;
 export const createBoxStyles = () =>
   `
     box-sizing: border-box;
     display: inline-block;
-    background-color: ${colors.bg};
+    background-color: ${bg};
   `;
 export const createBorderStyles = (invert = false) =>
   invert
@@ -32,9 +32,9 @@ export const createBorderStyles = (invert = false) =>
         border-top-color: ${dark};
         border-right-color: ${light};
         border-bottom-color: ${light};
-        box-shadow: inset 1px 1px 0px 1px ${darkGray},
-          inset -1px -1px 0 1px ${lightGray}
-            ${props => props.shadow && ", " + shadow};
+        box-shadow: ${props => props.shadow && shadow + ", "} inset 1px 1px 0px
+            1px ${darkGray},
+          inset -1px -1px 0 1px ${lightGray};
       `
     : css`
         border-style: solid;
@@ -43,9 +43,9 @@ export const createBorderStyles = (invert = false) =>
         border-top-color: ${light};
         border-right-color: ${dark};
         border-bottom-color: ${dark};
-        box-shadow: inset 1px 1px 0px 1px ${lightGray},
-          inset -1px -1px 0 1px ${darkGray}
-            ${props => props.shadow && ", " + shadow};
+        box-shadow: ${props => props.shadow && shadow + ", "} inset 1px 1px 0px
+            1px ${lightGray},
+          inset -1px -1px 0 1px ${darkGray};
       `;
 
 export const StyledCutout = styled.div`
@@ -77,7 +77,7 @@ export const StyledCutout = styled.div`
     border-bottom-color: ${lightGray};
 
     pointer-events: none;
-    ${props => props.shadow && insetShadow}
+    ${props => props.shadow && "box-shadow:" + insetShadow + ";"}
   }
 `;
 
@@ -90,9 +90,8 @@ export const StyledTextInput = styled.input`
   background: none;
   font-size: ${fontSizes.md};
 
-  color: ${props => (props.disabled ? colors.darkGray : colors.dark)};
-  text-shadow: ${props =>
-    props.disabled ? "1px 1px " + colors.light : "none"};
+  color: ${props => (props.disabled ? darkGray : dark)};
+  text-shadow: ${props => (props.disabled ? "1px 1px " + light : "none")};
   filter: ${props => (props.disabled ? "grayscale(100%)" : "none")};
   /* negative margin to compensate for wrapper borders */
 `;