diff --git a/src/components/Badge/Badge.vue b/src/components/Badge/Badge.vue
index 66b91ac..2894663 100644
--- a/src/components/Badge/Badge.vue
+++ b/src/components/Badge/Badge.vue
@@ -1,33 +1,28 @@
 <template>
   <component :is="wrapperType" :class="badgeClasses" :href="href">
-    <slot name="icon"/>
+    <slot name="icon" />
     <slot name="default" />
   </component>
 </template>
 <script lang="ts" setup>
-import { computed, toRefs, useSlots } from 'vue'
-import type { PropType } from 'vue'
+import { computed, useSlots } from 'vue'
 import type { BadgeType, BadgeSize } from './types'
 import { useBadgeClasses } from '@/components/Badge/composables/useBadgeClasses'
 
-const props = defineProps({
-  type: {
-    type: String as PropType<BadgeType>,
-    default: 'default',
-  },
-  size: {
-    type: String as PropType<BadgeSize>,
-    default: 'xs',
-  },
-  href: {
-    type: String,
-    default: null,
-  },
+interface IBadgeProps {
+  type?: BadgeType
+  size?: BadgeSize
+  href?: string | null
+}
+const props = withDefaults(defineProps<IBadgeProps>(), {
+  type: 'default',
+  size: 'xs',
+  href: null,
 })
 
 const slots = useSlots()
 const isContentEmpty = computed(() => !slots.default)
-const wrapperType = computed(() => props.href ? 'a' : 'span')
+const wrapperType = computed(() => (props.href ? 'a' : 'span'))
 
-const { badgeClasses } = useBadgeClasses(toRefs(props), { isContentEmpty })
+const { badgeClasses } = useBadgeClasses(props, { isContentEmpty })
 </script>
diff --git a/src/components/Badge/composables/useBadgeClasses.ts b/src/components/Badge/composables/useBadgeClasses.ts
index 4fde9d7..4996eb4 100644
--- a/src/components/Badge/composables/useBadgeClasses.ts
+++ b/src/components/Badge/composables/useBadgeClasses.ts
@@ -1,61 +1,65 @@
 import type { BadgeType, BadgeSize } from '../types'
-import { computed } from 'vue'
-import type { Ref } from 'vue'
-import classNames from 'classnames'
+import { computed, type Ref, useAttrs } from 'vue'
+import { twMerge } from 'tailwind-merge'
 
 const defaultBadgeClasses = 'mr-2 px-2.5 py-0.5 rounded flex items-center justify-center'
 const badgeLinkClasses = 'bg-blue-100 hover:bg-blue-200 text-blue-800 dark:text-blue-800 dark:hover:bg-blue-300'
 const onlyIconClasses = 'p-1 rounded-full mr-2'
 
 const badgeTextClasses: Record<BadgeType, string> = {
-    default: 'text-blue-800 dark:text-blue-800',
-    dark: 'text-gray-800 dark:bg-gray-700',
-    red: 'text-red-800 dark:text-red-900',
-    green: 'text-green-800 dark:text-green-900',
-    yellow: 'text-yellow-800 dark:text-yellow-900',
-    indigo: 'text-indigo-800 dark:text-indigo-900',
-    purple: 'text-purple-800 dark:text-purple-900',
-    pink: 'text-pink-800 dark:text-pink-900',
+  default: 'text-blue-800 dark:text-blue-800',
+  dark: 'text-gray-800 dark:bg-gray-700',
+  red: 'text-red-800 dark:text-red-900',
+  green: 'text-green-800 dark:text-green-900',
+  yellow: 'text-yellow-800 dark:text-yellow-900',
+  indigo: 'text-indigo-800 dark:text-indigo-900',
+  purple: 'text-purple-800 dark:text-purple-900',
+  pink: 'text-pink-800 dark:text-pink-900',
 }
 
 const badgeTypeClasses: Record<BadgeType, string> = {
-    default: 'bg-blue-100 dark:bg-blue-200',
-    dark: 'bg-gray-100 dark:bg-gray-700',
-    red: 'bg-red-100 dark:bg-red-200',
-    green: 'bg-green-100 dark:bg-green-200',
-    yellow: 'bg-yellow-100 dark:bg-yellow-200',
-    indigo: 'bg-indigo-100 dark:bg-indigo-200',
-    purple: 'bg-purple-100 dark:bg-purple-200',
-    pink: 'bg-pink-100 dark:bg-pink-200',
+  default: 'bg-blue-100 dark:bg-blue-200',
+  dark: 'bg-gray-100 dark:bg-gray-700',
+  red: 'bg-red-100 dark:bg-red-200',
+  green: 'bg-green-100 dark:bg-green-200',
+  yellow: 'bg-yellow-100 dark:bg-yellow-200',
+  indigo: 'bg-indigo-100 dark:bg-indigo-200',
+  purple: 'bg-purple-100 dark:bg-purple-200',
+  pink: 'bg-pink-100 dark:bg-pink-200',
 }
 
 const badgeSizeClasses: Record<BadgeSize, string> = {
-    xs: 'text-xs font-semibold',
-    sm: 'text-sm font-medium',
+  xs: 'text-xs font-semibold',
+  sm: 'text-sm font-medium',
 }
 
 export type UseBadgeClassesProps = {
-    type: Ref<BadgeType>
-    size: Ref<BadgeSize>
-    href: Ref<string>
+  type: BadgeType
+  size: BadgeSize
+  href: string | null
 }
 export type UseBadgeClassesOptions = {
-    isContentEmpty: Ref<boolean>
+  isContentEmpty: Ref<boolean>
 }
 
-export function useBadgeClasses(props: UseBadgeClassesProps, options: UseBadgeClassesOptions): {
-    badgeClasses: Ref<string>
+export function useBadgeClasses(
+  props: UseBadgeClassesProps,
+  options: UseBadgeClassesOptions,
+): {
+  badgeClasses: Ref<string>
 } {
-    const badgeClasses = computed<string>(() => {
-        return classNames(
-            badgeSizeClasses[props.size.value],
-            props.href.value ? '' : badgeTypeClasses[props.type.value],
-            props.href.value ? '' : badgeTextClasses[props.type.value],
-            props.href.value ? badgeLinkClasses : '',
-            options.isContentEmpty.value ? onlyIconClasses : defaultBadgeClasses,
-        )
-    })
-    return {
-        badgeClasses,
-    }
+  const attrs = useAttrs()
+  const badgeClasses = computed<string>(() => {
+    return twMerge(
+      badgeSizeClasses[props.size],
+      props.href ? '' : badgeTypeClasses[props.type],
+      props.href ? '' : badgeTextClasses[props.type],
+      props.href ? badgeLinkClasses : '',
+      options.isContentEmpty.value ? onlyIconClasses : defaultBadgeClasses,
+      attrs.class as string,
+    )
+  })
+  return {
+    badgeClasses,
+  }
 }