diff --git a/src/styles/index.css b/.storybook/index.css
similarity index 68%
rename from src/styles/index.css
rename to .storybook/index.css
index 06a4a6c7..f5bbb9dc 100644
--- a/src/styles/index.css
+++ b/.storybook/index.css
@@ -1,3 +1,6 @@
+/* This is the global dassana stylesheet. It should match the global stylesheet in web-orchestrator. */
+
+@import '~normalize.css';
 @import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap');
 
 body {
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index a17ad985..6e007cc2 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -1,6 +1,5 @@
 import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
-import 'normalize.css'
-import '../src/styles/index.css'
+import './index.css'
 
 export const parameters = {
 	actions: { argTypesRegex: '^on[A-Z].*' },
diff --git a/package-lock.json b/package-lock.json
index e8aa0f8d..1d4f3728 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2092,6 +2092,7 @@
 			"version": "14.0.0",
 			"resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-14.0.0.tgz",
 			"integrity": "sha512-+PSmD9ePwTAeU106i9FRdc+Zb3XUWyW26mo5Atr2mk82hor8+nPwkztEjFo8/B1fJKfaQDg9aM2bzQkjhi7zOw==",
+			"dev": true,
 			"requires": {
 				"@rollup/pluginutils": "^3.0.8",
 				"commondir": "^1.0.1",
@@ -2102,10 +2103,21 @@
 				"resolve": "^1.11.0"
 			}
 		},
+		"@rollup/plugin-image": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@rollup/plugin-image/-/plugin-image-2.0.5.tgz",
+			"integrity": "sha512-R+yGLJjLN1won2JlZPZmdlyZGLZwwsW8V/RYu3mTcRq8Aqd9GC2fo4Zi892bFteM5LolfbpxK8Y9QQcAhbBwSQ==",
+			"dev": true,
+			"requires": {
+				"@rollup/pluginutils": "^3.0.4",
+				"mini-svg-data-uri": "^1.1.3"
+			}
+		},
 		"@rollup/plugin-node-resolve": {
 			"version": "8.4.0",
 			"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz",
 			"integrity": "sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==",
+			"dev": true,
 			"requires": {
 				"@rollup/pluginutils": "^3.1.0",
 				"@types/resolve": "1.17.1",
@@ -2120,6 +2132,7 @@
 					"version": "1.17.0",
 					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
 					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
@@ -2130,6 +2143,7 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
 			"integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+			"dev": true,
 			"requires": {
 				"@types/estree": "0.0.39",
 				"estree-walker": "^1.0.1",
@@ -5452,7 +5466,8 @@
 		"@types/estree": {
 			"version": "0.0.39",
 			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-			"integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+			"integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+			"dev": true
 		},
 		"@types/glob": {
 			"version": "7.1.3",
@@ -5732,6 +5747,7 @@
 			"version": "1.17.1",
 			"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
 			"integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -8150,7 +8166,8 @@
 		"builtin-modules": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-			"integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="
+			"integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+			"dev": true
 		},
 		"builtin-status-codes": {
 			"version": "3.0.0",
@@ -11294,7 +11311,8 @@
 		"deep-freeze": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
-			"integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ="
+			"integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=",
+			"dev": true
 		},
 		"deep-is": {
 			"version": "0.1.3",
@@ -11310,7 +11328,8 @@
 		"deepmerge": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"dev": true
 		},
 		"default-gateway": {
 			"version": "4.2.0",
@@ -12694,7 +12713,8 @@
 		"estree-walker": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-			"integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+			"integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+			"dev": true
 		},
 		"esutils": {
 			"version": "2.0.3",
@@ -14719,7 +14739,8 @@
 		"is-module": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-			"integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
+			"integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+			"dev": true
 		},
 		"is-number": {
 			"version": "3.0.0",
@@ -14799,6 +14820,7 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
 			"integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+			"dev": true,
 			"requires": {
 				"@types/estree": "*"
 			}
@@ -16916,6 +16938,7 @@
 			"version": "0.25.7",
 			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
 			"integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+			"dev": true,
 			"requires": {
 				"sourcemap-codec": "^1.4.4"
 			}
@@ -17381,6 +17404,12 @@
 				"shallowequal": "^1.0.2"
 			}
 		},
+		"mini-svg-data-uri": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.2.3.tgz",
+			"integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ==",
+			"dev": true
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -17851,7 +17880,8 @@
 		"normalize.css": {
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz",
-			"integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg=="
+			"integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==",
+			"dev": true
 		},
 		"npm-run-path": {
 			"version": "2.0.2",
@@ -21662,9 +21692,10 @@
 			}
 		},
 		"rollup": {
-			"version": "2.23.0",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz",
-			"integrity": "sha512-vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg==",
+			"version": "2.26.4",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.4.tgz",
+			"integrity": "sha512-6+qsGuP0MXGd7vlYmk72utm1MrgZj5GfXibGL+cRkKQ9+ZL/BnFThDl0D5bcl7AqlzMjAQXRAwZX1HVm22M/4Q==",
+			"dev": true,
 			"requires": {
 				"fsevents": "~2.1.2"
 			}
@@ -21793,21 +21824,23 @@
 			}
 		},
 		"rollup-plugin-typescript2": {
-			"version": "0.27.1",
-			"resolved": "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.1.tgz",
-			"integrity": "sha512-RJl77Bbj1EunAQDC3dK/O2HWuSUX3oJbRGzyLoS5o9W4Hs1Nix3Gavqj1Lzs5Y6Ff4H2xXfmZ1WWUQCYocSbzQ==",
+			"version": "0.27.2",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.2.tgz",
+			"integrity": "sha512-zarMH2F8oT/NO6p20gl/jkts+WxyzOlhOIUwUU/EDx5e6ewdDPS/flwLj5XFuijUCr64bZwqKuRVwCPdXXYefQ==",
+			"dev": true,
 			"requires": {
-				"@rollup/pluginutils": "^3.0.8",
+				"@rollup/pluginutils": "^3.1.0",
 				"find-cache-dir": "^3.3.1",
 				"fs-extra": "8.1.0",
-				"resolve": "1.15.1",
-				"tslib": "1.11.2"
+				"resolve": "1.17.0",
+				"tslib": "2.0.1"
 			},
 			"dependencies": {
 				"find-cache-dir": {
 					"version": "3.3.1",
 					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
 					"integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+					"dev": true,
 					"requires": {
 						"commondir": "^1.0.1",
 						"make-dir": "^3.0.2",
@@ -21818,6 +21851,7 @@
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
 					"requires": {
 						"locate-path": "^5.0.0",
 						"path-exists": "^4.0.0"
@@ -21827,6 +21861,7 @@
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
 					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
 					"requires": {
 						"p-locate": "^4.1.0"
 					}
@@ -21835,6 +21870,7 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
 					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+					"dev": true,
 					"requires": {
 						"semver": "^6.0.0"
 					}
@@ -21843,6 +21879,7 @@
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
 					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
 					"requires": {
 						"p-limit": "^2.2.0"
 					}
@@ -21850,28 +21887,32 @@
 				"path-exists": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+					"dev": true
 				},
 				"pkg-dir": {
 					"version": "4.2.0",
 					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
 					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+					"dev": true,
 					"requires": {
 						"find-up": "^4.0.0"
 					}
 				},
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
 				},
 				"tslib": {
-					"version": "1.11.2",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz",
-					"integrity": "sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+					"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==",
+					"dev": true
 				}
 			}
 		},
@@ -22574,7 +22615,8 @@
 		"sourcemap-codec": {
 			"version": "1.4.8",
 			"resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-			"integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+			"integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+			"dev": true
 		},
 		"space-separated-tokens": {
 			"version": "1.1.5",
diff --git a/package.json b/package.json
index fbf2bf7f..323b1b28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dassana-io/web-components",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"publishConfig": {
 		"registry": "https://npm.pkg.github.com/dassana-io"
 	},
@@ -10,8 +10,6 @@
 		"directory": "@dassana-io/web-components"
 	},
 	"dependencies": {
-		"@rollup/plugin-commonjs": "^14.0.0",
-		"@rollup/plugin-node-resolve": "^8.4.0",
 		"@testing-library/jest-dom": "^4.2.4",
 		"@testing-library/react": "^9.5.0",
 		"@testing-library/user-event": "^7.2.1",
@@ -21,14 +19,11 @@
 		"@types/react-dom": "^16.9.8",
 		"antd": "^4.5.4",
 		"classnames": "^2.2.6",
-		"normalize.css": "^8.0.1",
 		"react": "^16.13.1",
 		"react-dom": "^16.13.1",
 		"react-jss": "^10.4.0",
 		"react-loading-skeleton": "^2.1.1",
 		"react-scripts": "^3.4.3",
-		"rollup": "^2.23.0",
-		"rollup-plugin-typescript2": "^0.27.1",
 		"typescript": "^3.9.7"
 	},
 	"scripts": {
@@ -60,6 +55,9 @@
 		]
 	},
 	"devDependencies": {
+		"@rollup/plugin-commonjs": "^14.0.0",
+		"@rollup/plugin-image": "^2.0.5",
+		"@rollup/plugin-node-resolve": "^8.4.0",
 		"@storybook/addon-actions": "^6.0.16",
 		"@storybook/addon-essentials": "^6.0.16",
 		"@storybook/addon-links": "^6.0.16",
@@ -76,8 +74,11 @@
 		"enzyme": "^3.11.0",
 		"enzyme-adapter-react-16": "^1.15.2",
 		"eslint-plugin-react": "^7.20.5",
+		"normalize.css": "^8.0.1",
 		"react-test-renderer": "^16.13.1",
-		"rollup-plugin-styles": "^3.10.0"
+		"rollup": "^2.26.4",
+		"rollup-plugin-styles": "^3.10.0",
+		"rollup-plugin-typescript2": "^0.27.2"
 	},
 	"peerDependencies": {
 		"react": ">=16.13",
diff --git a/rollup.config.ts b/rollup.config.ts
index a8e4fb50..8175ef22 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -1,4 +1,5 @@
 import commonjs from '@rollup/plugin-commonjs'
+import image from '@rollup/plugin-image'
 import resolve from '@rollup/plugin-node-resolve'
 import styles from 'rollup-plugin-styles'
 import typescript from 'rollup-plugin-typescript2'
@@ -25,6 +26,7 @@ export default {
 		resolve(),
 		commonjs(),
 		styles(),
+		image(),
 		typescript({
 			tsconfig: 'tsconfig.rollup.json',
 			useTsconfigDeclarationDir: true
diff --git a/src/__snapshots__/storybook.test.ts.snap b/src/__snapshots__/storybook.test.ts.snap
index bbab594d..807c3bc5 100644
--- a/src/__snapshots__/storybook.test.ts.snap
+++ b/src/__snapshots__/storybook.test.ts.snap
@@ -103,10 +103,10 @@ exports[`Storyshots Icon Predefined 1`] = `
 
 exports[`Storyshots InputField Default 1`] = `
 <div
-  className="container-0-2-3 container-d0-0-2-8"
+  className="container-0-2-2 container-d0-0-2-7"
 >
   <div
-    className="label-0-2-6"
+    className="label-0-2-5"
   >
     Field Label
   </div>
@@ -126,15 +126,15 @@ exports[`Storyshots InputField Default 1`] = `
 
 exports[`Storyshots InputField Error 1`] = `
 <div
-  className="container-0-2-3 container-d4-0-2-12"
+  className="container-0-2-2 container-d4-0-2-11"
 >
   <div
-    className="label-0-2-6"
+    className="label-0-2-5"
   >
     Field Label
   </div>
   <input
-    className="ant-input error-0-2-4"
+    className="ant-input error-0-2-3"
     disabled={false}
     onBlur={[Function]}
     onChange={[Function]}
@@ -149,10 +149,10 @@ exports[`Storyshots InputField Error 1`] = `
 
 exports[`Storyshots InputField Full Width 1`] = `
 <div
-  className="container-0-2-3 container-d3-0-2-11"
+  className="container-0-2-2 container-d3-0-2-10"
 >
   <div
-    className="label-0-2-6"
+    className="label-0-2-5"
   >
     Field Label
   </div>
@@ -172,10 +172,10 @@ exports[`Storyshots InputField Full Width 1`] = `
 
 exports[`Storyshots InputField Loading 1`] = `
 <div
-  className="container-0-2-3 container-d2-0-2-10"
+  className="container-0-2-2 container-d2-0-2-9"
 >
   <div
-    className="label-0-2-6"
+    className="label-0-2-5"
   >
     <span>
       <span
@@ -191,7 +191,7 @@ exports[`Storyshots InputField Loading 1`] = `
     </span>
   </div>
   <div
-    className="input-0-2-5"
+    className="input-0-2-4"
   >
     <span>
       <span
diff --git a/src/components/Icon/IconsMap.ts b/src/components/Icon/IconsMap.ts
index 3361e0ff..c9c5722c 100644
--- a/src/components/Icon/IconsMap.ts
+++ b/src/components/Icon/IconsMap.ts
@@ -1,6 +1,6 @@
-import AWS from 'assets/icons/aws.svg'
-import DASSANA_BLUE from 'assets/icons/dassana-blue.png'
-import DASSANA_ORANGE from 'assets/icons/dassana-orange.png'
+import AWS from '../assets/icons/aws.svg'
+import DASSANA_BLUE from '../assets/icons/dassana-blue.png'
+import DASSANA_ORANGE from '../assets/icons/dassana-orange.png'
 
 const Icons = {
 	'aws-logo': AWS,
diff --git a/src/components/InputField/index.tsx b/src/components/InputField/index.tsx
index cbdc02f0..26d55cd1 100644
--- a/src/components/InputField/index.tsx
+++ b/src/components/InputField/index.tsx
@@ -6,10 +6,12 @@ import Skeleton from 'react-loading-skeleton'
 import React, { FC } from 'react'
 
 const useStyles = createUseStyles({
-	'@keyframes shake': {
-		'0%, 100%': { left: '0rem' },
-		'20%, 60%': { left: '0.5rem' },
-		'40%, 80%': { left: '-0.5rem' }
+	'@global': {
+		'@keyframes shake': {
+			'0%, 100%': { left: '0rem' },
+			'20%, 60%': { left: '0.5rem' },
+			'40%, 80%': { left: '-0.5rem' }
+		}
 	},
 	container: {
 		display: 'flex',
diff --git a/src/components/Link/index.tsx b/src/components/Link/index.tsx
index 72c37f01..7017866e 100644
--- a/src/components/Link/index.tsx
+++ b/src/components/Link/index.tsx
@@ -1,6 +1,6 @@
 import 'antd/lib/typography/style/index.css'
 import { createUseStyles } from 'react-jss'
-import { linkColor } from 'styles/styleguide'
+import { linkColor } from '../assets/styleguide'
 import { Typography } from 'antd'
 import React, { FC, ReactNode } from 'react'
 
diff --git a/src/assets/icons/aws.svg b/src/components/assets/icons/aws.svg
similarity index 100%
rename from src/assets/icons/aws.svg
rename to src/components/assets/icons/aws.svg
diff --git a/src/assets/icons/dassana-blue.png b/src/components/assets/icons/dassana-blue.png
similarity index 100%
rename from src/assets/icons/dassana-blue.png
rename to src/components/assets/icons/dassana-blue.png
diff --git a/src/assets/icons/dassana-orange.png b/src/components/assets/icons/dassana-orange.png
similarity index 100%
rename from src/assets/icons/dassana-orange.png
rename to src/components/assets/icons/dassana-orange.png
diff --git a/src/styles/styleguide.ts b/src/components/assets/styleguide.ts
similarity index 100%
rename from src/styles/styleguide.ts
rename to src/components/assets/styleguide.ts
diff --git a/src/components/index.ts b/src/components/index.ts
index 9db4fc45..c159beb6 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1,8 +1,6 @@
-import 'normalize.css'
-// import 'styles/index.css'
 export { default as Button } from './Button'
 export { default as InputField } from './InputField'
-// export { default as Icon } from './Icon'
+export { default as Icon } from './Icon'
 export { default as Link } from './Link'
 export { default as Tag } from './Tag'
 export { default as Toggle } from './Toggle'
diff --git a/tsconfig.json b/tsconfig.json
index 060abccd..a840e2c0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,8 +15,7 @@
 		"resolveJsonModule": true,
 		"isolatedModules": true,
 		"noEmit": true,
-		"jsx": "react",
-		"baseUrl": "src"
+		"jsx": "react"
 	},
 	"include": ["src"]
 }
diff --git a/tsconfig.rollup.json b/tsconfig.rollup.json
index 4529cd84..183783a4 100644
--- a/tsconfig.rollup.json
+++ b/tsconfig.rollup.json
@@ -1,5 +1,5 @@
 {
 	"extends": "./tsconfig.json",
-	"include": ["components/**/*"],
+	"include": ["components/**/*", "src/custom.d.ts"],
 	"exclude": ["components/**/*.stories.tsx", "components/**/*.test.tsx"]
 }