diff --git a/packages/components/button-group/index.ts b/packages/components/button-group/index.ts
index 98970050..d3934a74 100644
--- a/packages/components/button-group/index.ts
+++ b/packages/components/button-group/index.ts
@@ -2,10 +2,9 @@ import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import ButtonGroup from './src/button-group.vue'
-import ButtonGroupCe from './src/button-group.ce.vue'
 
 export const PuikButtonGroup = withInstall(ButtonGroup)
-export const PuikButtonGroupCe = defineCustomElement(withInstall(ButtonGroupCe))
+export const PuikButtonGroupCe = defineCustomElement(PuikButtonGroup)
 
 if (!customElements.get('puik-button-group-ce')) {
   customElements.define('puik-button-group-ce', PuikButtonGroupCe)
diff --git a/packages/components/button-group/src/button-group.ce.vue b/packages/components/button-group/src/button-group.ce.vue
deleted file mode 100644
index 352f76a2..00000000
--- a/packages/components/button-group/src/button-group.ce.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div class="puik-button-group">
-    <slot></slot>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { provide } from 'vue'
-import { useVModel } from '@vueuse/core'
-import { buttonGroupProps, ButtonGroupKey } from './button-group'
-
-defineOptions({
-  name: 'PuikButtonGroup',
-})
-
-const props = defineProps(buttonGroupProps)
-const selected = useVModel(props, 'modelValue')
-
-provide(ButtonGroupKey, { selected })
-</script>
-
-<style lang="scss">
-@use '../../../theme/src/base';
-@use '../../../theme/src/button-group.scss';
-</style>
diff --git a/packages/components/button/index.ts b/packages/components/button/index.ts
index 7c9aa3a8..985da8ba 100644
--- a/packages/components/button/index.ts
+++ b/packages/components/button/index.ts
@@ -2,10 +2,9 @@ import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import Button from './src/button.vue'
-import ButtonCe from './src/button.ce.vue'
 
 export const PuikButton = withInstall(Button)
-export const PuikButtonCe = defineCustomElement(withInstall(ButtonCe))
+export const PuikButtonCe = defineCustomElement(PuikButton)
 
 if (!customElements.get('puik-button-ce')) {
   customElements.define('puik-button-ce', PuikButtonCe)
diff --git a/packages/components/button/src/button.ce.vue b/packages/components/button/src/button.ce.vue
deleted file mode 100644
index 32be5c7a..00000000
--- a/packages/components/button/src/button.ce.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <component
-    :is="componentType"
-    v-bind="pathProp"
-    class="puik-button"
-    :class="[
-      `puik-button--${variant}`,
-      `puik-button--${size}`,
-      { 'puik-button--disabled': disabled },
-      { 'puik-button--fluid': fluid },
-    ]"
-    :disabled="disabled"
-    @click="setSelected"
-  >
-    <puik-icon
-      v-if="leftIcon"
-      :icon="leftIcon"
-      :font-size="size !== 'sm' ? '1.25rem' : '1rem'"
-      class="puik-button__left-icon"
-    />
-    <slot></slot>
-    <puik-icon
-      v-if="rightIcon"
-      :icon="rightIcon"
-      :font-size="size !== 'sm' ? '1.25rem' : '1rem'"
-      class="puik-button__right-icon"
-    />
-  </component>
-</template>
-
-<script setup lang="ts">
-import { computed, inject } from 'vue'
-import { PuikIcon } from '@puik/components/icon'
-import { ButtonGroupKey } from '../../button-group'
-import { buttonProps } from './button'
-defineOptions({
-  name: 'PuikButton',
-})
-
-const props = defineProps(buttonProps)
-const buttonGroup = inject(ButtonGroupKey, undefined)
-
-const componentType = computed(() => {
-  if (props.to) {
-    return 'router-link'
-  } else if (props.href) {
-    return 'a'
-  }
-  return 'button'
-})
-
-const pathProp = computed(() =>
-  props.to ? { to: props.to } : { href: props.href }
-)
-
-const setSelected = () => {
-  if (buttonGroup && props.value) {
-    buttonGroup.selected.value = props.value
-  }
-}
-</script>
-
-<style lang="scss">
-@use '../../../theme/src/base';
-@use '../../../theme/src/button.scss';
-</style>
diff --git a/packages/components/icon/index.ts b/packages/components/icon/index.ts
index 073d3484..0a5c6332 100644
--- a/packages/components/icon/index.ts
+++ b/packages/components/icon/index.ts
@@ -2,10 +2,9 @@ import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import Icon from './src/icon.vue'
-import IconCe from './src/icon.ce.vue'
 
 export const PuikIcon = withInstall(Icon)
-export const PuikIconCe = defineCustomElement(withInstall(IconCe))
+export const PuikIconCe = defineCustomElement(PuikIcon)
 
 if (!customElements.get('puik-icon-ce')) {
   customElements.define('puik-icon-ce', PuikIconCe)
diff --git a/packages/components/icon/src/icon.ce.vue b/packages/components/icon/src/icon.ce.vue
deleted file mode 100644
index 439a385a..00000000
--- a/packages/components/icon/src/icon.ce.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <component
-    :is="nodeType"
-    class="puik-icon"
-    :class="`material-icons-round`"
-    :style="style"
-  >
-    {{ icon }}
-  </component>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { iconProps } from './icon'
-defineOptions({
-  name: 'PuikIcon',
-})
-
-const props = defineProps(iconProps)
-
-const fontSize = computed(() => {
-  if (!Number.isNaN(Number(props.fontSize))) {
-    return `${props.fontSize}px`
-  }
-
-  return props.fontSize
-})
-
-const style = {
-  fontSize: fontSize.value,
-  color: props.color,
-}
-</script>
-
-<style lang="scss">
-@import '../../../theme/src/base';
-@import '../../../theme/src/icon';
-</style>
diff --git a/packages/components/input/index.ts b/packages/components/input/index.ts
index 1f47e5d5..73bef73f 100644
--- a/packages/components/input/index.ts
+++ b/packages/components/input/index.ts
@@ -2,10 +2,9 @@ import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import Input from './src/input.vue'
-import InputCe from './src/input.ce.vue'
 
 export const PuikInput = withInstall(Input)
-export const PuikInputCe = defineCustomElement(withInstall(InputCe))
+export const PuikInputCe = defineCustomElement(PuikInput)
 
 if (!customElements.get('puik-input-ce')) {
   customElements.define('puik-input-ce', PuikInputCe)
diff --git a/packages/components/input/src/input.ce.vue b/packages/components/input/src/input.ce.vue
deleted file mode 100644
index b1933c46..00000000
--- a/packages/components/input/src/input.ce.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <div ref="CeRef" class="puik-input">
-    <div class="puik-input__wrapper" :class="inputClasses">
-      <div v-if="hasSlotPrepend" class="puik-input__prepend">
-        <slot name="prepend"></slot>
-      </div>
-      <input
-        :id="id"
-        v-model="internalValue"
-        class="puik-input__field"
-        :placeholder="placeholder"
-        :type="passwordIsVisible ? 'text' : type"
-        :disabled="disabled"
-        :required="required"
-        :autocomplete="autocomplete"
-        :name="name"
-        :min="type === 'number' ? min : undefined"
-        :max="type === 'number' ? max : undefined"
-        :step="type === 'number' ? step : undefined"
-        @input="updateCeRefModelValue"
-        @focus="handleFocus"
-        @blur="handleBlur"
-      />
-      <span
-        v-if="type === 'password'"
-        class="puik-input__reveal-password"
-        @click="togglePasswordVisibility"
-        >{{ passwordIsVisible ? 'visibility' : 'visibility_off' }}</span
-      >
-      <div v-if="hasSlotAppend" class="puik-input__append">
-        <slot name="append"></slot>
-      </div>
-      <puik-input-controls
-        v-if="type === 'number'"
-        :disabled="disabled"
-        @increase="increase"
-        @decrease="decrease"
-      ></puik-input-controls>
-    </div>
-    <div v-if="hasSlotHint || hint || hasError" class="puik-input__hint">
-      <span v-show="!hideHint" v-if="!hasError" class="puik-input__hint__text">
-        <slot v-if="hint && !hasSlotHint" name="hint">{{ hint }}</slot>
-        <slot v-else name="hint"></slot>
-      </span>
-      <div v-if="hasError" class="puik-input__hint__error">
-        <puik-icon
-          icon="error"
-          class="puik-input__hint__error__icon"
-          font-size="1.25rem"
-        ></puik-icon>
-        <span class="puik-input__hint__error__text">
-          <slot name="error">{{ error }}</slot>
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import { computed, ref, useSlots } from 'vue'
-import { isNumber } from '@vueuse/core'
-import { PuikIcon } from '@puik/components/icon'
-import { slotIsEmpty } from '@puik/utils'
-import PuikInputControls from './controls/controls.vue'
-import { inputProps } from './input'
-
-defineOptions({
-  name: 'PuikInput',
-})
-const props = defineProps(inputProps)
-const slots = useSlots()
-const isFocus = ref(false)
-const passwordIsVisible = ref(false)
-
-const CeRef = ref<HTMLElement | null>(null)
-const internalValue = ref<string | number>('')
-
-const updateCeRefModelValue = () => {
-  CeRef?.value?.setAttribute('model-value', String(internalValue.value))
-}
-
-const inputClasses = computed(() => ({
-  'puik-input__wrapper--focus': isFocus.value,
-  'puik-input__wrapper--disabled': props.disabled,
-  'puik-input__wrapper--success': props.success,
-  'puik-input__wrapper--error': hasError.value,
-}))
-
-const handleFocus = () => (isFocus.value = true)
-const handleBlur = () => (isFocus.value = false)
-
-const togglePasswordVisibility = () =>
-  (passwordIsVisible.value = !passwordIsVisible.value)
-
-const increase = () => {
-  if (isNumber(internalValue.value) && internalValue.value < props.max) {
-    internalValue.value += props.step
-  }
-}
-const decrease = () => {
-  if (isNumber(internalValue.value) && internalValue.value > props.min) {
-    internalValue.value -= props.step
-  }
-}
-
-const hasError = computed(() => props.error || slotIsEmpty(slots.error))
-</script>
-
-<style lang="scss">
-@use '../../../theme/src/base';
-@use '../../../theme/src/input.scss';
-</style>
diff --git a/packages/components/input/src/input.vue b/packages/components/input/src/input.vue
index 4cdbb637..24533cdb 100644
--- a/packages/components/input/src/input.vue
+++ b/packages/components/input/src/input.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="puik-input">
     <div class="puik-input__wrapper" :class="inputClasses">
-      <div v-if="$slots.prepend" class="puik-input__prepend">
+      <div v-if="$slots.prepend || hasSlotPrepend" class="puik-input__prepend">
         <slot name="prepend"></slot>
       </div>
       <input
@@ -26,7 +26,10 @@
         @click="togglePasswordVisibility"
         >{{ passwordIsVisible ? 'visibility' : 'visibility_off' }}</span
       >
-      <div v-else-if="$slots.append" class="puik-input__append">
+      <div
+        v-else-if="$slots.append || hasSlotAppend"
+        class="puik-input__append"
+      >
         <slot name="append"></slot>
       </div>
       <puik-input-controls
@@ -36,13 +39,14 @@
         @decrease="decrease"
       ></puik-input-controls>
     </div>
-    <div v-if="$slots.hint || hasError" class="puik-input__hint">
+    <div v-if="$slots.hint || hasSlotHint || hasError" class="puik-input__hint">
       <span
         v-show="!hideHint"
-        v-if="$slots.hint && !hasError"
+        v-if="($slots.hint || hasSlotHint) && !hasError"
         class="puik-input__hint__text"
-        ><slot name="hint"></slot
-      ></span>
+      >
+        <slot name="hint"></slot>
+      </span>
       <div v-if="hasError" class="puik-input__hint__error">
         <puik-icon
           icon="error"
diff --git a/packages/components/tooltip/index.ts b/packages/components/tooltip/index.ts
index f8a14fbe..edd92886 100644
--- a/packages/components/tooltip/index.ts
+++ b/packages/components/tooltip/index.ts
@@ -2,10 +2,9 @@ import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import Tooltip from './src/tooltip.vue'
-import TooltipCe from './src/tooltip.ce.vue'
 
 export const PuikTooltip = withInstall(Tooltip)
-export const PuikTooltipCe = defineCustomElement(withInstall(TooltipCe))
+export const PuikTooltipCe = defineCustomElement(PuikTooltip)
 
 if (!customElements.get('puik-tooltip-ce')) {
   customElements.define('puik-tooltip-ce', PuikTooltipCe)
diff --git a/packages/components/tooltip/src/tooltip.ce.vue b/packages/components/tooltip/src/tooltip.ce.vue
deleted file mode 100644
index 5499da33..00000000
--- a/packages/components/tooltip/src/tooltip.ce.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div
-    class="puik-tooltip"
-    tabindex="0"
-    :aria-describedby="id"
-    @mouseover="updateTooltip"
-    @mouseleave="start"
-  >
-    <div ref="tooltipWrapper" class="puik-tooltip__wrapper">
-      <slot></slot>
-    </div>
-    <Transition
-      enter-from-class="puik-tooltip__transition__enter-from"
-      leave-to-class="puik-tooltip__transition__leave-to"
-    >
-      <div
-        v-show="!isDisabled && isVisible"
-        :id="id"
-        ref="tooltip"
-        class="puik-tooltip__tip"
-        role="tooltip"
-        :style="{ 'z-index': zindex, 'max-width': maxWidth }"
-      >
-        <div class="puik-tooltip__tip__content">
-          <span v-if="title" class="puik-tooltip__tip__content__title"
-            ><slot name="title">{{ title }}</slot></span
-          >
-          <span
-            v-if="description"
-            class="puik-tooltip__tip__content__description"
-            ><slot name="description">{{ description }}</slot></span
-          >
-        </div>
-
-        <div class="puik-tooltip__tip__arrow" data-popper-arrow></div>
-      </div>
-    </Transition>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import { createPopper } from '@popperjs/core'
-import { useTimeoutFn } from '@vueuse/core'
-import { generateId } from '@puik/utils'
-import { tooltipProps } from './tooltip'
-import type { Instance as PopperInstance } from '@popperjs/core'
-defineOptions({
-  name: 'PuikTooltip',
-})
-
-const tooltipWrapper = ref<HTMLElement | null>(null)
-const tooltip = ref<HTMLElement | null>(null)
-const isVisible = ref(false)
-let popperInstance: PopperInstance | null = null
-const id = `puik-tooltip-${generateId()}`
-
-const props = defineProps(tooltipProps)
-
-const { start, stop, isPending } = useTimeoutFn(() => {
-  isVisible.value = false
-}, props.disappearDelay)
-
-const updateTooltip = () => {
-  if (isPending) {
-    stop()
-  }
-  isVisible.value = true
-  popperInstance?.update()
-}
-
-onMounted(() => {
-  if (tooltipWrapper.value && tooltip.value) {
-    popperInstance = createPopper(tooltipWrapper.value, tooltip.value, {
-      placement: props.position,
-      modifiers: [
-        {
-          name: 'offset',
-          options: {
-            offset: [0, 12],
-          },
-        },
-      ],
-    })
-  }
-})
-</script>
-
-<style lang="scss">
-@use '../../../theme/src/base';
-@use '../../../theme/src/tooltip.scss';
-</style>
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
index 13372824..a01e7f1b 100644
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
           isCustomElement: (tag) => tag.includes('-ce'),
         },
       },
-      customElement: /\.ce\.vue$/,
+      customElement: /^(?!.*App\.vue).*$/,
     }),
     DefineOptions(),
   ],