diff --git a/src/components/Tag/Tag.Skeleton.svelte b/src/components/Tag/Tag.Skeleton.svelte
index 3c1e5daa..30924cd1 100644
--- a/src/components/Tag/Tag.Skeleton.svelte
+++ b/src/components/Tag/Tag.Skeleton.svelte
@@ -1,15 +1,8 @@
-<script>
-  let className = undefined;
-  export { className as class };
-  export let style = undefined;
-
-  import { cx } from '../../lib';
-</script>
-
 <span
+  class:bx--tag={true}
+  class:bx--skeleton={true}
+  {...$$restProps}
   on:click
   on:mouseover
   on:mouseenter
-  on:mouseleave
-  class={cx('--tag', '--skeleton', className)}
-  {style} />
+  on:mouseleave />
diff --git a/src/components/Tag/Tag.Story.svelte b/src/components/Tag/Tag.Story.svelte
index 596ee4ab..b6031b72 100644
--- a/src/components/Tag/Tag.Story.svelte
+++ b/src/components/Tag/Tag.Story.svelte
@@ -5,19 +5,25 @@
   export let story = undefined;
   export let type = undefined;
 
-  import Layout from '../../internal/ui/Layout.svelte';
-  import Tag from './Tag.svelte';
-  import TagSkeleton from './Tag.Skeleton.svelte';
+  import Layout from "../../internal/ui/Layout.svelte";
+  import Tag from "./Tag.svelte";
+  import TagSkeleton from "./Tag.Skeleton.svelte";
 </script>
 
 <Layout>
   <div>
     {#if story === 'filter'}
-      <Tag {filter}>{slot}</Tag>
+      <Tag
+        {filter}
+        on:click={() => {
+          console.log('click');
+        }}>
+        {slot}
+      </Tag>
     {:else if story === 'skeleton'}
       <TagSkeleton />
     {:else}
-      <Tag {disabled} {type}>{slot}</Tag>
+      <Tag {disabled} {type} class="class">{slot}</Tag>
     {/if}
   </div>
 </Layout>
diff --git a/src/components/Tag/Tag.stories.js b/src/components/Tag/Tag.stories.js
index 6858b164..16cffe04 100644
--- a/src/components/Tag/Tag.stories.js
+++ b/src/components/Tag/Tag.stories.js
@@ -1,29 +1,45 @@
-import { withKnobs, select, boolean, text } from '@storybook/addon-knobs';
-import Component from './Tag.Story.svelte';
-import { TYPES } from './constants';
+import { withKnobs, select, boolean, text } from "@storybook/addon-knobs";
+import Component from "./Tag.Story.svelte";
 
-export default { title: 'Tag', decorators: [withKnobs] };
+export default { title: "Tag", decorators: [withKnobs] };
+
+const TYPES = {
+  red: "Red",
+  magenta: "Magenta",
+  purple: "Purple",
+  blue: "Blue",
+  cyan: "Cyan",
+  teal: "Teal",
+  green: "Green",
+  gray: "Gray",
+  "cool-gray": "Cool-Gray",
+  "warm-gray": "Warm-Gray",
+  "high-contrast": "High-Contrast",
+};
 
 export const Default = () => ({
   Component,
   props: {
     type: select(
-      'Tag type (type)',
-      Object.keys(TYPES).reduce((items, item) => ({ ...items, [`${item} (${item})`]: item }), {}),
-      'red'
+      "Tag type (type)",
+      Object.keys(TYPES).reduce(
+        (items, item) => ({ ...items, [`${item} (${item})`]: item }),
+        {}
+      ),
+      "red"
     ),
-    disabled: boolean('Disabled (disabled)', false),
-    slot: text('Content ($$slot)', 'This is not a tag')
-  }
+    disabled: boolean("Disabled (disabled)", false),
+    slot: text("Content ($$slot)", "This is a tag"),
+  },
 });
 
 export const Filter = () => ({
   Component,
   props: {
-    story: 'filter',
+    story: "filter",
     filter: true,
-    slot: text('Content ($$slot)', 'This is not a tag')
-  }
+    slot: text("Content ($$slot)", "This is a tag"),
+  },
 });
 
-export const Skeleton = () => ({ Component, props: { story: 'skeleton' } });
+export const Skeleton = () => ({ Component, props: { story: "skeleton" } });
diff --git a/src/components/Tag/Tag.svelte b/src/components/Tag/Tag.svelte
index 1af43ab0..7fa869df 100644
--- a/src/components/Tag/Tag.svelte
+++ b/src/components/Tag/Tag.svelte
@@ -1,28 +1,47 @@
 <script>
-  let className = undefined;
-  export { className as class };
-  export let disabled = false;
-  export let filter = false;
-  export let style = undefined;
-  export let title = 'Clear filter';
   export let type = undefined;
+  export let filter = false;
+  export let title = "Clear filter";
+  export let disabled = false;
+  export let id = "ccs-" + Math.random().toString(36);
 
-  import Close16 from 'carbon-icons-svelte/lib/Close16';
-  import { cx } from '../../lib';
-  import { TYPES } from './constants';
+  import Close16 from "carbon-icons-svelte/lib/Close16";
 </script>
 
-<span
-  tabindex={filter ? '0' : undefined}
-  title={filter ? title : undefined}
-  on:click
-  on:mouseover
-  on:mouseenter
-  on:mouseleave
-  class={cx('--tag', type && `--tag--${type}`, disabled && '--tag--disabled', filter && '--tag--filter', className)}
-  {style}>
-  <slot>{TYPES[type]}</slot>
-  {#if filter}
-    <Close16 aria-label={title} />
-  {/if}
-</span>
+{#if filter}
+  <div
+    aria-label={title}
+    class:bx--tag={true}
+    class:bx--tag--disabled={disabled}
+    class:bx--tag--filter={filter}
+    class="bx--tag--{type}"
+    {id}
+    {...$$restProps}>
+    <slot class="bx--tag__label">
+      <span class:bx--tag__label={true}>{type}</span>
+    </slot>
+    <button
+      aria-labelledby={id}
+      class:bx--tag__close-icon={true}
+      {disabled}
+      {title}
+      on:click|stopPropagation
+      on:mouseover
+      on:mouseenter
+      on:mouseleave>
+      <Close16 />
+    </button>
+  </div>
+{:else}
+  <span
+    class:bx--tag={true}
+    class:bx--tag--disabled={disabled}
+    class="bx--tag--{type}"
+    {...$$restProps}
+    on:click
+    on:mouseover
+    on:mouseenter
+    on:mouseleave>
+    <slot />
+  </span>
+{/if}
diff --git a/src/components/Tag/constants.js b/src/components/Tag/constants.js
deleted file mode 100644
index 84af65cf..00000000
--- a/src/components/Tag/constants.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const TYPES = {
-  red: 'Red',
-  magenta: 'Magenta',
-  purple: 'Purple',
-  blue: 'Blue',
-  cyan: 'Cyan',
-  teal: 'Teal',
-  green: 'Green',
-  gray: 'Gray',
-  'cool-gray': 'Cool-Gray',
-  'warm-gray': 'Warm-Gray'
-};
diff --git a/src/components/Tag/index.js b/src/components/Tag/index.js
index 255b5591..21b86b2c 100644
--- a/src/components/Tag/index.js
+++ b/src/components/Tag/index.js
@@ -1,4 +1,2 @@
-import Tag from './Tag.svelte';
-
-export default Tag;
-export { default as TagSkeleton } from './Tag.Skeleton.svelte';
+export { default as Tag } from "./Tag.svelte";
+export { default as TagSkeleton } from "./Tag.Skeleton.svelte";