diff --git a/resources/views/admin/tabs/linked-services.blade.php b/resources/views/admin/tabs/linked-services.blade.php
index 3a43c6d..d6e0d26 100644
--- a/resources/views/admin/tabs/linked-services.blade.php
+++ b/resources/views/admin/tabs/linked-services.blade.php
@@ -15,21 +15,21 @@
     <div class="flex flex-col flex-shrink-0 gap-2 md:flex-row">
         <form method="get" action="{{ url()->current() }}">
             <input type="hidden" name="tab" value="{{ request()->get('tab') }}">
-            <x-text-input id="search"
+            <x-input.text id="search"
                           name="search"
                           class="w-48"
                           placeholder="{{ Lang::get('admin.panel.search') }}..."
                           :value="request()->get('search')"
             />
         </form>
-        <x-primary-button x-data
+        <x-button.primary x-data
                           @click.prevent="$dispatch('open-modal', 'link-service')"
         >
             <span class="mr-2">
                 {{ Lang::get('admin.panel.linked-services.link-service.title') }}
             </span>
             <i class="fa-solid fa-link"></i>
-        </x-primary-button>
+        </x-button.primary>
     </div>
 </div>
 
@@ -106,35 +106,35 @@ class="text-blue-700 hover:text-blue-900"
             {{ Lang::get('admin.panel.linked-services.link-service.description') }}.
         </p>
         <div class="mt-6">
-            <x-input-label for="service_id" :value="Lang::get('admin.panel.linked-services.link-service.service_id')" />
-            <x-select-input id="service_id"
+            <x-input.label for="service_id" :value="Lang::get('admin.panel.linked-services.link-service.service_id')" />
+            <x-input.select id="service_id"
                             name="service_id"
                             class="mt-1"
                             required
                             :options="Service::enabled()->get()->mapWithKeys(fn (Service $service) => [$service->id => $service->name])"
                             :selected="old('service_id')"
             />
-            <x-input-error :messages="$errors->createUser->get('service_id')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('service_id')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="user_id" :value="Lang::get('admin.panel.linked-services.link-service.user_id')" />
-            <x-select-input id="user_id"
+            <x-input.label for="user_id" :value="Lang::get('admin.panel.linked-services.link-service.user_id')" />
+            <x-input.select id="user_id"
                             name="user_id"
                             class="mt-1"
                             required
                             :options="User::get()->mapWithKeys(fn (User $user) => [$user->id => $user->username])"
                             :selected="old('user_id')"
             />
-            <x-input-error :messages="$errors->createUser->get('user_id')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('user_id')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="identifier" :value="Lang::get('admin.panel.linked-services.link-service.identifier') . ' (' . Lang::get('main.optional') . ')'" />
-            <x-text-input id="identifier"
+            <x-input.label for="identifier" :value="Lang::get('admin.panel.linked-services.link-service.identifier') . ' (' . Lang::get('main.optional') . ')'" />
+            <x-input.text id="identifier"
                           name="identifier"
                           class="block mt-1 w-full"
                           :value="old('identifier')"
             />
-            <x-input-error :messages="$errors->createService->get('identifier')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('identifier')" class="mt-2" />
         </div>
         <div class="mt-6 flex justify-end">
             <x-modal.secondary-button x-on:click="$dispatch('close')">
diff --git a/resources/views/admin/tabs/services.blade.php b/resources/views/admin/tabs/services.blade.php
index 3ba0fc1..ed7c85b 100644
--- a/resources/views/admin/tabs/services.blade.php
+++ b/resources/views/admin/tabs/services.blade.php
@@ -10,21 +10,21 @@
     <div class="flex flex-col flex-shrink-0 gap-2 md:flex-row">
         <form method="get" action="{{ url()->current() }}">
             <input type="hidden" name="tab" value="{{ request()->get('tab') }}">
-            <x-text-input id="search"
+            <x-input.text id="search"
                           name="search"
                           class="w-48"
                           placeholder="{{ Lang::get('admin.panel.search') }}..."
                           :value="request()->get('search')"
             />
         </form>
-        <x-primary-button x-data
+        <x-button.primary x-data
                           @click.prevent="$dispatch('open-modal', 'create-service')"
         >
             <span class="mr-2">
                 {{ Lang::get('admin.panel.services.create-service.title') }}
             </span>
             <i class="fa-solid fa-plus"></i>
-        </x-primary-button>
+        </x-button.primary>
     </div>
 </div>
 
@@ -109,64 +109,64 @@ class="text-blue-700 hover:text-blue-900"
             {{ Lang::get('admin.panel.services.create-service.description') }}.
         </p>
         <div class="mt-6">
-            <x-input-label for="name" :value="Lang::get('validation.attributes.name')" />
-            <x-text-input id="name"
+            <x-input.label for="name" :value="Lang::get('validation.attributes.name')" />
+            <x-input.text id="name"
                           name="name"
                           class="block mt-1 w-full"
                           required
                           :value="old('name')"
             />
-            <x-input-error :messages="$errors->createService->get('name')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('name')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="description" :value="Lang::get('validation.attributes.description')" />
-            <x-textarea-input id="description"
+            <x-input.label for="description" :value="Lang::get('validation.attributes.description')" />
+            <x-input.textarea id="description"
                               name="description"
                               class="block mt-1 w-full"
                               rows="4"
                               required
                               x-bind:value="'{{ old('description') }}'"
             />
-            <x-input-error :messages="$errors->createService->get('description')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('description')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="icon" :value="Lang::get('validation.attributes.icon')" />
-            <x-text-input id="icon"
+            <x-input.label for="icon" :value="Lang::get('validation.attributes.icon')" />
+            <x-input.text id="icon"
                           name="icon"
                           class="block mt-1 w-full"
                           required
                           :value="old('icon')"
             />
-            <x-input-error :messages="$errors->createService->get('icon')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('icon')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="link" :value="Lang::get('validation.attributes.link')" />
-            <x-text-input id="link"
+            <x-input.label for="link" :value="Lang::get('validation.attributes.link')" />
+            <x-input.text id="link"
                           name="link"
                           class="block mt-1 w-full"
                           required
                           :value="old('link')"
             />
-            <x-input-error :messages="$errors->createService->get('link')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('link')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label :value="Lang::get('admin.panel.services.create-service.toggles')" />
+            <x-input.label :value="Lang::get('admin.panel.services.create-service.toggles')" />
             <div class="flex flex-col gap-2 md:flex-row md:gap-8 mt-1">
-                <x-checkbox-input id="is_public"
+                <x-input.checkbox id="is_public"
                                   name="is_public"
                                   :checked="old('is_public')"
                 >
                     {{ Lang::get('admin.panel.services.create-service.is_public') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="is_enabled"
+                </x-input.checkbox>
+                <x-input.checkbox id="is_enabled"
                                   name="is_enabled"
                                   :checked="old('is_enabled')"
                 >
                     {{ Lang::get('admin.panel.services.create-service.is_enabled') }}
-                </x-checkbox-input>
+                </x-input.checkbox>
             </div>
-            <x-input-error :messages="$errors->createService->get('is_public')" class="mt-2" />
-            <x-input-error :messages="$errors->createService->get('is_enabled')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('is_public')" class="mt-2" />
+            <x-input.error :messages="$errors->createService->get('is_enabled')" class="mt-2" />
         </div>
         <div class="mt-6 flex justify-end">
             <x-modal.secondary-button x-on:click="$dispatch('close')">
@@ -196,64 +196,64 @@ class="p-6"
         </p>
         <input type="hidden" name="id" x-bind:value="form.id || '{{ old('id') }}'">
         <div class="mt-6">
-            <x-input-label for="new_name" :value="Lang::get('validation.attributes.name')" />
-            <x-text-input id="new_name"
+            <x-input.label for="new_name" :value="Lang::get('validation.attributes.name')" />
+            <x-input.text id="new_name"
                           name="new_name"
                           class="block mt-1 w-full"
                           required
                           x-bind:value="form.name || '{{ old('new_name') }}'"
             />
-            <x-input-error :messages="$errors->updateService->get('new_name')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_name')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_description" :value="Lang::get('validation.attributes.description')" />
-            <x-textarea-input id="new_description"
+            <x-input.label for="new_description" :value="Lang::get('validation.attributes.description')" />
+            <x-input.textarea id="new_description"
                               name="new_description"
                               class="block mt-1 w-full"
                               rows="4"
                               required
                               x-bind:value="JSON.stringify(form.description) || '{{ old('new_description') }}'"
             />
-            <x-input-error :messages="$errors->updateService->get('new_description')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_description')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_icon" :value="Lang::get('validation.attributes.icon')" />
-            <x-text-input id="new_icon"
+            <x-input.label for="new_icon" :value="Lang::get('validation.attributes.icon')" />
+            <x-input.text id="new_icon"
                           name="new_icon"
                           class="block mt-1 w-full"
                           required
                           x-bind:value="form.icon || '{{ old('new_icon') }}'"
             />
-            <x-input-error :messages="$errors->updateService->get('new_icon')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_icon')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_link" :value="Lang::get('validation.attributes.link')" />
-            <x-text-input id="new_link"
+            <x-input.label for="new_link" :value="Lang::get('validation.attributes.link')" />
+            <x-input.text id="new_link"
                           name="new_link"
                           class="block mt-1 w-full"
                           required
                           x-bind:value="form.link || '{{ old('new_link') }}'"
             />
-            <x-input-error :messages="$errors->updateService->get('new_link')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_link')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label :value="Lang::get('admin.panel.services.update-service.toggles')" />
+            <x-input.label :value="Lang::get('admin.panel.services.update-service.toggles')" />
             <div class="flex flex-col gap-2 md:flex-row md:gap-8 mt-1">
-                <x-checkbox-input id="new_is_public"
+                <x-input.checkbox id="new_is_public"
                                   name="new_is_public"
                                   x-bind:value="form.is_public === true || '{{ old('new_is_public') }}' === 'on'"
                 >
                     {{ Lang::get('admin.panel.services.update-service.is_public') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="new_is_enabled"
+                </x-input.checkbox>
+                <x-input.checkbox id="new_is_enabled"
                                   name="new_is_enabled"
                                   x-bind:value="form.is_enabled === true || '{{ old('new_is_enabled') }}' === 'on'"
                 >
                     {{ Lang::get('admin.panel.services.update-service.is_enabled') }}
-                </x-checkbox-input>
+                </x-input.checkbox>
             </div>
-            <x-input-error :messages="$errors->updateService->get('new_is_public')" class="mt-2" />
-            <x-input-error :messages="$errors->updateService->get('new_is_enabled')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_is_public')" class="mt-2" />
+            <x-input.error :messages="$errors->updateService->get('new_is_enabled')" class="mt-2" />
         </div>
         <div class="mt-6 flex justify-end">
             <x-modal.secondary-button x-on:click="$dispatch('close')">
diff --git a/resources/views/admin/tabs/users.blade.php b/resources/views/admin/tabs/users.blade.php
index a32d78d..959c38f 100644
--- a/resources/views/admin/tabs/users.blade.php
+++ b/resources/views/admin/tabs/users.blade.php
@@ -10,21 +10,21 @@
     <div class="flex flex-col flex-shrink-0 gap-2 md:flex-row">
         <form method="get" action="{{ url()->current() }}">
             <input type="hidden" name="tab" value="{{ request()->get('tab', 'users') }}">
-            <x-text-input id="search"
+            <x-input.text id="search"
                           name="search"
                           class="w-48"
                           placeholder="{{ Lang::get('admin.panel.search') }}..."
                           :value="request()->get('search')"
             />
         </form>
-        <x-primary-button x-data
+        <x-button.primary x-data
                           @click.prevent="$dispatch('open-modal', 'create-user')"
         >
             <span class="mr-2">
                 {{ Lang::get('admin.panel.users.create-user.title') }}
             </span>
             <i class="fa-solid fa-user-plus"></i>
-        </x-primary-button>
+        </x-button.primary>
     </div>
 </div>
 
@@ -112,70 +112,70 @@ class="text-blue-700 hover:text-blue-900"
             {{ Lang::get('admin.panel.users.create-user.description-2') }}.
         </p>
         <div class="mt-6">
-            <x-input-label for="username" :value="Lang::get('validation.attributes.username')" />
-            <x-text-input id="username"
+            <x-input.label for="username" :value="Lang::get('validation.attributes.username')" />
+            <x-input.text id="username"
                           name="username"
                           class="block mt-1 w-full"
                           required
                           :value="old('username')"
             />
-            <x-input-error :messages="$errors->createUser->get('username')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('username')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="email" :value="Lang::get('validation.attributes.email')" />
-            <x-text-input id="email"
+            <x-input.label for="email" :value="Lang::get('validation.attributes.email')" />
+            <x-input.text id="email"
                           name="email"
                           class="block mt-1 w-full"
                           type="email"
                           required
                           :value="old('email')"
             />
-            <x-input-error :messages="$errors->createUser->get('email')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('email')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="password" :value="Lang::get('validation.attributes.password') . ' (' . Lang::get('main.optional') . ')'" />
-            <x-password-input id="password"
+            <x-input.label for="password" :value="Lang::get('validation.attributes.password') . ' (' . Lang::get('main.optional') . ')'" />
+            <x-input.password id="password"
                               name="password"
                               class="mt-1"
             />
-            <x-input-error :messages="$errors->createUser->get('password')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('password')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="language" :value="Lang::get('validation.attributes.language')" />
-            <x-select-input id="language"
+            <x-input.label for="language" :value="Lang::get('validation.attributes.language')" />
+            <x-input.select id="language"
                             name="language"
                             class="mt-1"
                             required
                             :options="collect(config('app.languages'))->mapWithKeys(fn (string $code) => [$code => Lang::get('main.languages.' . $code)])"
                             :selected="old('language')"
             />
-            <x-input-error :messages="$errors->createUser->get('language')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('language')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label :value="Lang::get('admin.panel.users.create-user.toggles')" />
+            <x-input.label :value="Lang::get('admin.panel.users.create-user.toggles')" />
             <div class="flex flex-col gap-2 md:flex-row md:gap-8 mt-1">
-                <x-checkbox-input id="is_admin"
+                <x-input.checkbox id="is_admin"
                                   name="is_admin"
                                   :checked="old('is_admin')"
                 >
                     {{ Lang::get('admin.panel.users.create-user.is_admin') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="is_enabled"
+                </x-input.checkbox>
+                <x-input.checkbox id="is_enabled"
                                   name="is_enabled"
                                   :checked="old('is_enabled')"
                 >
                     {{ Lang::get('admin.panel.users.create-user.is_enabled') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="is_verified"
+                </x-input.checkbox>
+                <x-input.checkbox id="is_verified"
                                   name="is_verified"
                                   :checked="old('is_verified')"
                 >
                     {{ Lang::get('admin.panel.users.create-user.is_verified') }}
-                </x-checkbox-input>
+                </x-input.checkbox>
             </div>
-            <x-input-error :messages="$errors->createUser->get('is_admin')" class="mt-2" />
-            <x-input-error :messages="$errors->createUser->get('is_enabled')" class="mt-2" />
-            <x-input-error :messages="$errors->createUser->get('is_verified')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('is_admin')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('is_enabled')" class="mt-2" />
+            <x-input.error :messages="$errors->createUser->get('is_verified')" class="mt-2" />
         </div>
         <div class="mt-6 flex justify-end">
             <x-modal.secondary-button x-on:click="$dispatch('close')">
@@ -205,70 +205,70 @@ class="p-6"
         </p>
         <input type="hidden" name="id" x-bind:value="form.id || '{{ old('id') }}'">
         <div class="mt-6">
-            <x-input-label for="new_username" :value="Lang::get('validation.attributes.username')" />
-            <x-text-input id="new_username"
+            <x-input.label for="new_username" :value="Lang::get('validation.attributes.username')" />
+            <x-input.text id="new_username"
                           name="new_username"
                           class="block mt-1 w-full"
                           required
                           x-bind:value="form.username || '{{ old('new_username') }}'"
             />
-            <x-input-error :messages="$errors->updateUser->get('new_username')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_username')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_email" :value="Lang::get('validation.attributes.email')" />
-            <x-text-input id="new_email"
+            <x-input.label for="new_email" :value="Lang::get('validation.attributes.email')" />
+            <x-input.text id="new_email"
                           name="new_email"
                           class="block mt-1 w-full"
                           type="email"
                           required
                           x-bind:value="form.email || '{{ old('new_email') }}'"
             />
-            <x-input-error :messages="$errors->updateUser->get('new_email')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_email')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_password" :value="Lang::get('validation.attributes.password') . ' (' . Lang::get('main.optional') . ')'" />
-            <x-password-input id="new_password"
+            <x-input.label for="new_password" :value="Lang::get('validation.attributes.password') . ' (' . Lang::get('main.optional') . ')'" />
+            <x-input.password id="new_password"
                               name="new_password"
                               class="mt-1"
             />
-            <x-input-error :messages="$errors->updateUser->get('new_password')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_password')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label for="new_language" :value="Lang::get('validation.attributes.language')" />
-            <x-select-input id="new_language"
+            <x-input.label for="new_language" :value="Lang::get('validation.attributes.language')" />
+            <x-input.select id="new_language"
                             name="new_language"
                             class="mt-1"
                             required
                             :options="collect(config('app.languages'))->mapWithKeys(fn (string $code) => [$code => Lang::get('main.languages.' . $code)])"
                             :selected="old('new_language')"
             />
-            <x-input-error :messages="$errors->updateUser->get('new_language')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_language')" class="mt-2" />
         </div>
         <div class="mt-4">
-            <x-input-label :value="Lang::get('admin.panel.users.update-user.toggles')" />
+            <x-input.label :value="Lang::get('admin.panel.users.update-user.toggles')" />
             <div class="flex flex-col gap-2 md:flex-row md:gap-8 mt-1">
-                <x-checkbox-input id="new_is_admin"
+                <x-input.checkbox id="new_is_admin"
                                   name="new_is_admin"
                                   x-bind:value="form.is_admin === true || '{{ old('new_is_admin') }}' === 'on'"
                 >
                     {{ Lang::get('admin.panel.users.update-user.is_admin') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="new_is_enabled"
+                </x-input.checkbox>
+                <x-input.checkbox id="new_is_enabled"
                                   name="new_is_enabled"
                                   x-bind:value="form.is_enabled === true || '{{ old('new_is_enabled') }}' === 'on'"
                 >
                     {{ Lang::get('admin.panel.users.update-user.is_enabled') }}
-                </x-checkbox-input>
-                <x-checkbox-input id="new_is_verified"
+                </x-input.checkbox>
+                <x-input.checkbox id="new_is_verified"
                                   name="new_is_verified"
                                   x-bind:value="form.email_verified_at !== null || '{{ old('new_is_verified') }}' === 'on'"
                 >
                     {{ Lang::get('admin.panel.users.update-user.is_verified') }}
-                </x-checkbox-input>
+                </x-input.checkbox>
             </div>
-            <x-input-error :messages="$errors->updateUser->get('new_is_admin')" class="mt-2" />
-            <x-input-error :messages="$errors->updateUser->get('new_is_enabled')" class="mt-2" />
-            <x-input-error :messages="$errors->updateUser->get('new_is_verified')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_is_admin')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_is_enabled')" class="mt-2" />
+            <x-input.error :messages="$errors->updateUser->get('new_is_verified')" class="mt-2" />
         </div>
         <div class="mt-6 flex justify-end">
             <x-modal.secondary-button x-on:click="$dispatch('close')">
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
index 9c0c1d4..b617002 100644
--- a/resources/views/auth/confirm-password.blade.php
+++ b/resources/views/auth/confirm-password.blade.php
@@ -25,22 +25,22 @@
 
                 <!-- Password -->
                 <div>
-                    <x-input-label for="password" :value="Lang::get('validation.attributes.password')" />
+                    <x-input.label for="password" :value="Lang::get('validation.attributes.password')" />
 
-                    <x-password-input id="password"
+                    <x-input.password id="password"
                                       class="mt-1"
                                       name="password"
                                       autocomplete="current-password"
                                       required
                     />
 
-                    <x-input-error :messages="$errors->get('password')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password')" class="mt-2" />
                 </div>
 
                 <div class="flex justify-end mt-4">
-                    <x-submit-button>
+                    <x-button.submit>
                         {{ Lang::get('auth.confirm-password.confirm') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </div>
             </form>
         </div>
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
index 7b64366..b41a689 100644
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -28,15 +28,15 @@
 
                 <!-- Email Address -->
                 <div>
-                    <x-input-label for="email" :value="Lang::get('validation.attributes.email')" />
-                    <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
-                    <x-input-error :messages="$errors->get('email')" class="mt-2" />
+                    <x-input.label for="email" :value="Lang::get('validation.attributes.email')" />
+                    <x-input.text id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
+                    <x-input.error :messages="$errors->get('email')" class="mt-2" />
                 </div>
 
                 <div class="flex items-center justify-end mt-4">
-                    <x-submit-button>
+                    <x-button.submit>
                         {{ Lang::get('auth.forgot-password.reset-password') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </div>
             </form>
         </div>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index b643d8f..4d0232c 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -25,33 +25,33 @@
 
                 <!-- Login -->
                 <div>
-                    <x-input-label for="login" :value="Lang::get('validation.attributes.login')" />
-                    <x-text-input id="login" class="block mt-1 w-full" type="text" name="login" :value="old('login')" required autofocus autocomplete="username" />
-                    <x-input-error :messages="$errors->get('login')" class="mt-2" />
+                    <x-input.label for="login" :value="Lang::get('validation.attributes.login')" />
+                    <x-input.text id="login" class="block mt-1 w-full" type="text" name="login" :value="old('login')" required autofocus autocomplete="username" />
+                    <x-input.error :messages="$errors->get('login')" class="mt-2" />
                 </div>
 
                 <!-- Password -->
                 <div class="mt-4">
-                    <x-input-label for="password" :value="Lang::get('validation.attributes.password')" />
+                    <x-input.label for="password" :value="Lang::get('validation.attributes.password')" />
 
-                    <x-password-input id="password"
+                    <x-input.password id="password"
                                       class="mt-1"
                                       name="password"
                                       autocomplete="current-password"
                                       required
                     />
 
-                    <x-input-error :messages="$errors->get('password')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password')" class="mt-2" />
                 </div>
 
                 <!-- Remember Me -->
                 <div class="block mt-4">
-                    <x-checkbox-input id="remember"
+                    <x-input.checkbox id="remember"
                                       name="remember"
                                       :checked="old('remember')"
                     >
                         {{ Lang::get('auth.login.remember-me') }}
-                    </x-checkbox-input>
+                    </x-input.checkbox>
                 </div>
 
                 <div class="flex items-center justify-end mt-4">
@@ -61,9 +61,9 @@ class="mt-1"
                         </a>
                     @endif
 
-                    <x-submit-button class="ms-3">
+                    <x-button.submit class="ms-3">
                         {{ Lang::get('auth.login.log-in') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </div>
             </form>
 
@@ -79,14 +79,14 @@ class="mt-1"
                 <!-- External Auth Providers -->
                 <div class="flex flex-col gap-2 justify-center md:flex-row">
                     @if(config('services.facebook.enabled'))
-                        <x-facebook-button class="w-full">
+                        <x-button.facebook class="w-full">
                             {{ Lang::get('main.menu.log-in-with-provider', ['provider' => 'Facebook']) }}
-                        </x-facebook-button>
+                        </x-button.facebook>
                     @endif
                     @if(config('services.google.enabled'))
-                        <x-google-button class="w-full">
+                        <x-button.google class="w-full">
                             {{ Lang::get('main.menu.log-in-with-provider', ['provider' => 'Google']) }}
-                        </x-google-button>
+                        </x-button.google>
                     @endif
                 </div>
             @endif
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 8a4fba1..6fd01e8 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -22,44 +22,44 @@
 
                 <!-- Username -->
                 <div>
-                    <x-input-label for="username" :value="Lang::get('validation.attributes.username')" />
-                    <x-text-input id="username" class="block mt-1 w-full" type="text" name="username" :value="old('username')" required autofocus autocomplete="username" />
-                    <x-input-error :messages="$errors->get('username')" class="mt-2" />
+                    <x-input.label for="username" :value="Lang::get('validation.attributes.username')" />
+                    <x-input.text id="username" class="block mt-1 w-full" type="text" name="username" :value="old('username')" required autofocus autocomplete="username" />
+                    <x-input.error :messages="$errors->get('username')" class="mt-2" />
                 </div>
 
                 <!-- Email Address -->
                 <div class="mt-4">
-                    <x-input-label for="email" :value="Lang::get('validation.attributes.email')" />
-                    <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autocomplete="email" />
-                    <x-input-error :messages="$errors->get('email')" class="mt-2" />
+                    <x-input.label for="email" :value="Lang::get('validation.attributes.email')" />
+                    <x-input.text id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autocomplete="email" />
+                    <x-input.error :messages="$errors->get('email')" class="mt-2" />
                 </div>
 
                 <!-- Password -->
                 <div class="mt-4">
-                    <x-input-label for="password" :value="Lang::get('validation.attributes.password')" />
+                    <x-input.label for="password" :value="Lang::get('validation.attributes.password')" />
 
-                    <x-password-input id="password"
+                    <x-input.password id="password"
                                       class="mt-1"
                                       name="password"
                                       autocomplete="new-password"
                                       required
                     />
 
-                    <x-input-error :messages="$errors->get('password')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password')" class="mt-2" />
                 </div>
 
                 <!-- Confirm Password -->
                 <div class="mt-4">
-                    <x-input-label for="password_confirmation" :value="Lang::get('validation.attributes.password_confirmation')" />
+                    <x-input.label for="password_confirmation" :value="Lang::get('validation.attributes.password_confirmation')" />
 
-                    <x-password-input id="password_confirmation"
+                    <x-input.password id="password_confirmation"
                                       class="mt-1"
                                       name="password_confirmation"
                                       autocomplete="new-password"
                                       required
                     />
 
-                    <x-input-error :messages="$errors->get('password_confirmation')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password_confirmation')" class="mt-2" />
                 </div>
 
                 <div class="flex items-center justify-end mt-4">
@@ -67,9 +67,9 @@ class="mt-1"
                         {{ Lang::get('auth.register.already-registered') }}
                     </a>
 
-                    <x-submit-button class="ms-4">
+                    <x-button.submit class="ms-4">
                         {{ Lang::get('auth.register.register') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </div>
             </form>
 
@@ -85,14 +85,14 @@ class="mt-1"
                 <!-- External Auth Providers -->
                 <div class="flex flex-col gap-2 justify-center md:flex-row">
                     @if(config('services.facebook.enabled'))
-                        <x-facebook-button class="w-full">
+                        <x-button.facebook class="w-full">
                             {{ Lang::get('main.menu.register-with-provider', ['provider' => 'Facebook']) }}
-                        </x-facebook-button>
+                        </x-button.facebook>
                     @endif
                     @if(config('services.google.enabled'))
-                        <x-google-button class="w-full">
+                        <x-button.google class="w-full">
                             {{ Lang::get('main.menu.register-with-provider', ['provider' => 'Google']) }}
-                        </x-google-button>
+                        </x-button.google>
                     @endif
                 </div>
             @endif
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
index c01896a..3d982a2 100644
--- a/resources/views/auth/reset-password.blade.php
+++ b/resources/views/auth/reset-password.blade.php
@@ -25,30 +25,30 @@
 
                 <!-- Email Address -->
                 <div>
-                    <x-input-label for="email" :value="Lang::get('validation.attributes.email')" />
-                    <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email', $request->email)" required autofocus autocomplete="email" />
-                    <x-input-error :messages="$errors->get('email')" class="mt-2" />
+                    <x-input.label for="email" :value="Lang::get('validation.attributes.email')" />
+                    <x-input.text id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email', $request->email)" required autofocus autocomplete="email" />
+                    <x-input.error :messages="$errors->get('email')" class="mt-2" />
                 </div>
 
                 <!-- Password -->
                 <div class="mt-4">
-                    <x-input-label for="password" :value="Lang::get('validation.attributes.new_password')" />
+                    <x-input.label for="password" :value="Lang::get('validation.attributes.new_password')" />
 
-                    <x-password-input id="password"
+                    <x-input.password id="password"
                                       class="mt-1"
                                       name="password"
                                       autocomplete="new-password"
                                       required
                     />
 
-                    <x-input-error :messages="$errors->get('password')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password')" class="mt-2" />
                 </div>
 
                 <!-- Confirm Password -->
                 <div class="mt-4">
-                    <x-input-label for="password_confirmation" :value="Lang::get('validation.attributes.new_password_confirmation')" />
+                    <x-input.label for="password_confirmation" :value="Lang::get('validation.attributes.new_password_confirmation')" />
 
-                    <x-text-input id="password_confirmation"
+                    <x-input.text id="password_confirmation"
                                   class="block mt-1 w-full"
                                   type="password"
                                   name="password_confirmation"
@@ -56,13 +56,13 @@ class="block mt-1 w-full"
                                   required
                     />
 
-                    <x-input-error :messages="$errors->get('password_confirmation')" class="mt-2" />
+                    <x-input.error :messages="$errors->get('password_confirmation')" class="mt-2" />
                 </div>
 
                 <div class="flex items-center justify-end mt-4">
-                    <x-submit-button>
+                    <x-button.submit>
                         {{ Lang::get('auth.reset-password.save') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </div>
             </form>
         </div>
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php
index 078e5ef..bd4f58d 100644
--- a/resources/views/auth/verify-email.blade.php
+++ b/resources/views/auth/verify-email.blade.php
@@ -40,9 +40,9 @@
                     @csrf
 
                     <div>
-                        <x-submit-button class="ms-4">
+                        <x-button.submit class="ms-4">
                             {{ Lang::get('auth.verify-email.resend-verification') }}
-                        </x-submit-button>
+                        </x-button.submit>
                     </div>
                 </form>
             </div>
diff --git a/resources/views/components/actions-menu.blade.php b/resources/views/components/actions-menu.blade.php
index 7ab1a39..b3a1c63 100644
--- a/resources/views/components/actions-menu.blade.php
+++ b/resources/views/components/actions-menu.blade.php
@@ -5,9 +5,9 @@
 @props(['navigation'])
 
 <aside {{ $attributes->merge(['class' => 'flex gap-2 items-center z-50']) }}>
-    <x-language-dropdown class="bg-white border hover:shadow-lg md:text-sm px-4 rounded-full md:py-2.5 text-xs" />
+    <x-dropdown.language class="bg-white border hover:shadow-lg md:text-sm px-4 rounded-full md:py-2.5 text-xs" />
 
-    <x-dropdown align="right" content-classes="bg-white px-6 py-4" width="w-72">
+    <x-dropdown.main align="right" content-classes="bg-white px-6 py-4" width="w-72">
         <x-slot name="trigger">
             <button type="button" class="bg-white border cursor-pointer flex hover:shadow-lg items-center justify-center px-4 py-2 rounded-full select-none transition-shadow">
                 <span class="font-bold hidden md:block mr-2">
@@ -30,9 +30,9 @@
                     <div class="border-t mb-2 mt-1"></div>
                     @foreach ($navigation->links() as $key => $value)
                         @continue(request()->routeIs($key))
-                        <x-menu-link :href="$value">
+                        <x-link.menu :href="$value">
                             {{ Lang::get('main.titles.' . $key) }}
-                        </x-menu-link>
+                        </x-link.menu>
                     @endforeach
                 </nav>
             @endif
@@ -42,18 +42,18 @@
                 </div>
                 <div class="border-t mb-2 mt-1"></div>
                 @auth
-                    <x-menu-link :href="route('profile.edit')">
+                    <x-link.menu :href="route('profile.edit')">
                         {{ Lang::get('main.titles.profile') }}
-                    </x-menu-link>
+                    </x-link.menu>
                     <form method="POST" action="{{ route('logout') }}">
                         @csrf
 
-                        <x-submit-button class="mt-2 w-full">
+                        <x-button.submit class="mt-2 w-full">
                             <span class="mr-2">
                                 {{ Lang::get('auth.actions.log-out') }}
                             </span>
                             <i class="fa-solid fa-right-from-bracket"></i>
-                        </x-submit-button>
+                        </x-button.submit>
                     </form>
                 @else
                     <a href="{{ route('login') }}" class="bg-blue-700 border flex hover:bg-blue-800 items-center justify-center px-4 py-2 rounded-full text-white mb-1">
@@ -79,19 +79,19 @@
                         </div>
                         <div class="flex flex-col gap-1">
                             @if(config('services.facebook.enabled'))
-                                <x-facebook-button>
+                                <x-button.facebook>
                                     {{ Lang::get('main.menu.log-in-with-provider', ['provider' => 'Facebook']) }}
-                                </x-facebook-button>
+                                </x-button.facebook>
                             @endif
                             @if(config('services.google.enabled'))
-                                <x-google-button>
+                                <x-button.google>
                                     {{ Lang::get('main.menu.log-in-with-provider', ['provider' => 'Google']) }}
-                                </x-google-button>
+                                </x-button.google>
                             @endif
                         </div>
                     @endif
                 @endauth
             </section>
         </x-slot>
-    </x-dropdown>
+    </x-dropdown.main>
 </aside>
diff --git a/resources/views/components/facebook-button.blade.php b/resources/views/components/button/facebook.blade.php
similarity index 100%
rename from resources/views/components/facebook-button.blade.php
rename to resources/views/components/button/facebook.blade.php
diff --git a/resources/views/components/google-button.blade.php b/resources/views/components/button/google.blade.php
similarity index 100%
rename from resources/views/components/google-button.blade.php
rename to resources/views/components/button/google.blade.php
diff --git a/resources/views/components/link-service-button.blade.php b/resources/views/components/button/link-service.blade.php
similarity index 100%
rename from resources/views/components/link-service-button.blade.php
rename to resources/views/components/button/link-service.blade.php
diff --git a/resources/views/components/primary-button.blade.php b/resources/views/components/button/primary.blade.php
similarity index 100%
rename from resources/views/components/primary-button.blade.php
rename to resources/views/components/button/primary.blade.php
diff --git a/resources/views/components/service-button.blade.php b/resources/views/components/button/service.blade.php
similarity index 100%
rename from resources/views/components/service-button.blade.php
rename to resources/views/components/button/service.blade.php
diff --git a/resources/views/components/submit-button.blade.php b/resources/views/components/button/submit.blade.php
similarity index 100%
rename from resources/views/components/submit-button.blade.php
rename to resources/views/components/button/submit.blade.php
diff --git a/resources/views/components/language-dropdown.blade.php b/resources/views/components/dropdown/language.blade.php
similarity index 91%
rename from resources/views/components/language-dropdown.blade.php
rename to resources/views/components/dropdown/language.blade.php
index f17e20d..af7b0bf 100644
--- a/resources/views/components/language-dropdown.blade.php
+++ b/resources/views/components/dropdown/language.blade.php
@@ -2,7 +2,7 @@
     use App\Http\Controllers\LanguageController;
 @endphp
 
-<x-dropdown align="right" content-classes="bg-white px-6 py-4" width="w-64">
+<x-dropdown.main align="right" content-classes="bg-white px-6 py-4" width="w-64">
     <x-slot name="trigger">
         <button {{ $attributes->merge(['class' => 'flex hover:text-gray-700 p-2 text-gray-500 transition']) }}>
             <div>
@@ -29,4 +29,4 @@
             </a>
         @endforeach
     </x-slot>
-</x-dropdown>
+</x-dropdown.main>
diff --git a/resources/views/components/dropdown.blade.php b/resources/views/components/dropdown/main.blade.php
similarity index 100%
rename from resources/views/components/dropdown.blade.php
rename to resources/views/components/dropdown/main.blade.php
diff --git a/resources/views/components/checkbox-input.blade.php b/resources/views/components/input/checkbox.blade.php
similarity index 100%
rename from resources/views/components/checkbox-input.blade.php
rename to resources/views/components/input/checkbox.blade.php
diff --git a/resources/views/components/input-error.blade.php b/resources/views/components/input/error.blade.php
similarity index 100%
rename from resources/views/components/input-error.blade.php
rename to resources/views/components/input/error.blade.php
diff --git a/resources/views/components/input-label.blade.php b/resources/views/components/input/label.blade.php
similarity index 100%
rename from resources/views/components/input-label.blade.php
rename to resources/views/components/input/label.blade.php
diff --git a/resources/views/components/password-input.blade.php b/resources/views/components/input/password.blade.php
similarity index 100%
rename from resources/views/components/password-input.blade.php
rename to resources/views/components/input/password.blade.php
diff --git a/resources/views/components/select-input.blade.php b/resources/views/components/input/select.blade.php
similarity index 100%
rename from resources/views/components/select-input.blade.php
rename to resources/views/components/input/select.blade.php
diff --git a/resources/views/components/text-input.blade.php b/resources/views/components/input/text.blade.php
similarity index 100%
rename from resources/views/components/text-input.blade.php
rename to resources/views/components/input/text.blade.php
diff --git a/resources/views/components/textarea-input.blade.php b/resources/views/components/input/textarea.blade.php
similarity index 100%
rename from resources/views/components/textarea-input.blade.php
rename to resources/views/components/input/textarea.blade.php
diff --git a/resources/views/components/menu-link.blade.php b/resources/views/components/link/menu.blade.php
similarity index 100%
rename from resources/views/components/menu-link.blade.php
rename to resources/views/components/link/menu.blade.php
diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/link/nav.blade.php
similarity index 100%
rename from resources/views/components/nav-link.blade.php
rename to resources/views/components/link/nav.blade.php
diff --git a/resources/views/components/responsive-nav-link.blade.php b/resources/views/components/link/responsive-nav.blade.php
similarity index 100%
rename from resources/views/components/responsive-nav-link.blade.php
rename to resources/views/components/link/responsive-nav.blade.php
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 0f685aa..2ed2d2d 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -68,9 +68,9 @@ class="absolute flex inset-0 items-center justify-center"
                         <p class="font-bold mb-4">
                             {{ Lang::get('services.not-linked') }}
                         </p>
-                        <x-link-service-button modal="link-service">
+                        <x-button.link-service modal="link-service">
                             {{ Lang::get('services.link-new') }}
-                        </x-link-service-button>
+                        </x-button.link-service>
                     @else
                         <p class="font-bold">
                             {{ Lang::get('services.not-available') }}
@@ -85,9 +85,9 @@ class="absolute flex inset-0 items-center justify-center"
                     <p class="font-bold mb-4">
                         {{ Lang::get('services.link-more-services') }}
                     </p>
-                    <x-link-service-button modal="link-service">
+                    <x-button.link-service modal="link-service">
                         {{ Lang::get('services.link-new') }}
-                    </x-link-service-button>
+                    </x-button.link-service>
                 </div>
             @endif
         </div>
@@ -105,8 +105,8 @@ class="absolute flex inset-0 items-center justify-center"
                     {{ Lang::get('services.link-modal.description-2') }}.
                 </p>
                 <div>
-                    <x-input-label for="serviceId" value="{{ Lang::get('services.link-modal.choose-service') }}" />
-                    <x-select-input id="serviceId"
+                    <x-input.label for="serviceId" value="{{ Lang::get('services.link-modal.choose-service') }}" />
+                    <x-input.select id="serviceId"
                                     name="serviceId"
                                     class="mt-1"
                                     :options="$unlinkedServices->mapWithKeys(fn (Service $service) => [$service->id => $service->name])"
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index fa054a7..1bd3fc3 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -24,7 +24,7 @@
                 </p>
                 <div class="flex flex-col flex-wrap gap-4 items-center justify-center md:flex-row">
                     @forelse (Service::enabled()->public()->get() as $service)
-                        <x-service-button :service="$service" />
+                        <x-button.service :service="$service" />
                     @empty
                         <div>
                             <p class="font-bold">
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php
index 6440681..2d7edab 100644
--- a/resources/views/layouts/navigation.blade.php
+++ b/resources/views/layouts/navigation.blade.php
@@ -15,9 +15,9 @@
                 <!-- Navigation Links -->
                 <div class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex">
                     @foreach ($navigation->links() as $key => $value)
-                        <x-nav-link :href="$value" :active="request()->routeIs($key)">
+                        <x-link.nav :href="$value" :active="request()->routeIs($key)">
                             {{ Lang::get('main.titles.' . $key) }}
-                        </x-nav-link>
+                        </x-link.nav>
                     @endforeach
                 </div>
             </div>
@@ -30,7 +30,7 @@
             <!-- Hamburger -->
             <div class="-me-2 flex items-center sm:hidden">
                 <div class="mr-1">
-                    <x-language-dropdown class="focus:bg-gray-100 hover:bg-gray-100 rounded" />
+                    <x-dropdown.language class="focus:bg-gray-100 hover:bg-gray-100 rounded" />
                 </div>
 
                 <button @click="open = !open" class="duration-150 ease-in-out focus:bg-gray-100 focus:outline-none focus:text-gray-700 h-8 hover:bg-gray-100 hover:text-gray-700 inline-flex items-center justify-center rounded-md text-gray-500 transition w-8">
@@ -45,9 +45,9 @@
     <div :class="{'block': open, 'hidden': !open}" class="hidden sm:hidden">
         <div class="pt-2 pb-3 space-y-1">
             @foreach ($navigation->links() as $key => $value)
-                <x-responsive-nav-link :href="$value" :active="request()->routeIs($key)">
+                <x-link.responsive-nav :href="$value" :active="request()->routeIs($key)">
                     {{ Lang::get('main.titles.' . $key) }}
-                </x-responsive-nav-link>
+                </x-link.responsive-nav>
             @endforeach
         </div>
 
@@ -63,19 +63,19 @@
             </div>
 
             <div class="mt-3 space-y-1">
-                <x-responsive-nav-link :href="route('profile.edit')">
+                <x-link.responsive-nav :href="route('profile.edit')">
                     {{ Lang::get('main.titles.profile') }}
-                </x-responsive-nav-link>
+                </x-link.responsive-nav>
 
                 <!-- Authentication -->
                 <form method="POST" action="{{ route('logout') }}">
                     @csrf
 
-                    <x-responsive-nav-link :href="route('logout')"
+                    <x-link.responsive-nav :href="route('logout')"
                                            onclick="event.preventDefault(); this.closest('form').submit();"
                     >
                         {{ Lang::get('auth.actions.log-out') }}
-                    </x-responsive-nav-link>
+                    </x-link.responsive-nav>
                 </form>
             </div>
         </div>
diff --git a/resources/views/profile/partials/delete-user-form.blade.php b/resources/views/profile/partials/delete-user-form.blade.php
index 57a29cd..488bf58 100644
--- a/resources/views/profile/partials/delete-user-form.blade.php
+++ b/resources/views/profile/partials/delete-user-form.blade.php
@@ -40,15 +40,15 @@
             </p>
 
             <div class="mt-6">
-                <x-input-label for="password" :value="Lang::get('validation.attributes.password')" />
+                <x-input.label for="password" :value="Lang::get('validation.attributes.password')" />
 
-                <x-password-input id="password"
+                <x-input.password id="password"
                                   name="password"
                                   class="mt-1"
                                   required
                 />
 
-                <x-input-error :messages="$errors->deleteProfile->get('password')" class="mt-2" />
+                <x-input.error :messages="$errors->deleteProfile->get('password')" class="mt-2" />
             </div>
 
             <div class="mt-6 flex justify-end">
diff --git a/resources/views/profile/partials/update-password-form.blade.php b/resources/views/profile/partials/update-password-form.blade.php
index ef176be..cb1d219 100644
--- a/resources/views/profile/partials/update-password-form.blade.php
+++ b/resources/views/profile/partials/update-password-form.blade.php
@@ -14,48 +14,48 @@
         @method('put')
 
         <div>
-            <x-input-label for="update_password_current_password" :value="Lang::get('validation.attributes.current_password')" />
+            <x-input.label for="update_password_current_password" :value="Lang::get('validation.attributes.current_password')" />
 
-            <x-password-input id="update_password_current_password"
+            <x-input.password id="update_password_current_password"
                               name="current_password"
                               class="mt-1"
                               autocomplete="current-password"
                               required
             />
 
-            <x-input-error :messages="$errors->updatePassword->get('current_password')" class="mt-2" />
+            <x-input.error :messages="$errors->updatePassword->get('current_password')" class="mt-2" />
         </div>
 
         <div>
-            <x-input-label for="update_password_password" :value="Lang::get('validation.attributes.new_password')" />
+            <x-input.label for="update_password_password" :value="Lang::get('validation.attributes.new_password')" />
 
-            <x-password-input id="update_password_password"
+            <x-input.password id="update_password_password"
                               name="password"
                               class="mt-1"
                               autocomplete="new-password"
                               required
             />
 
-            <x-input-error :messages="$errors->updatePassword->get('password')" class="mt-2" />
+            <x-input.error :messages="$errors->updatePassword->get('password')" class="mt-2" />
         </div>
 
         <div>
-            <x-input-label for="update_password_password_confirmation" :value="Lang::get('validation.attributes.new_password_confirmation')" />
+            <x-input.label for="update_password_password_confirmation" :value="Lang::get('validation.attributes.new_password_confirmation')" />
 
-            <x-password-input id="update_password_password_confirmation"
+            <x-input.password id="update_password_password_confirmation"
                               name="password_confirmation"
                               class="mt-1"
                               autocomplete="new-password"
                               required
             />
 
-            <x-input-error :messages="$errors->updatePassword->get('password_confirmation')" class="mt-2" />
+            <x-input.error :messages="$errors->updatePassword->get('password_confirmation')" class="mt-2" />
         </div>
 
         <div class="flex items-center gap-4">
-            <x-submit-button>
+            <x-button.submit>
                 {{ Lang::get('profile.actions.save') }}
-            </x-submit-button>
+            </x-button.submit>
 
             @if (session('status') === 'password-updated')
                 <p x-data="{ show: true }"
diff --git a/resources/views/profile/partials/update-profile-information-form.blade.php b/resources/views/profile/partials/update-profile-information-form.blade.php
index 69d9c98..60ec71e 100644
--- a/resources/views/profile/partials/update-profile-information-form.blade.php
+++ b/resources/views/profile/partials/update-profile-information-form.blade.php
@@ -17,15 +17,15 @@
         @method('patch')
 
         <div>
-            <x-input-label for="username" :value="Lang::get('validation.attributes.username')" />
-            <x-text-input id="username" name="username" type="text" class="mt-1 block w-full" :value="old('username', $user->username)" required autofocus autocomplete="username" />
-            <x-input-error class="mt-2" :messages="$errors->get('username')" />
+            <x-input.label for="username" :value="Lang::get('validation.attributes.username')" />
+            <x-input.text id="username" name="username" type="text" class="mt-1 block w-full" :value="old('username', $user->username)" required autofocus autocomplete="username" />
+            <x-input.error class="mt-2" :messages="$errors->get('username')" />
         </div>
 
         <div>
-            <x-input-label for="email" :value="Lang::get('validation.attributes.email')" />
-            <x-text-input id="email" name="email" type="email" class="mt-1 block w-full" :value="old('email', $user->email)" required autocomplete="email" />
-            <x-input-error class="mt-2" :messages="$errors->get('email')" />
+            <x-input.label for="email" :value="Lang::get('validation.attributes.email')" />
+            <x-input.text id="email" name="email" type="email" class="mt-1 block w-full" :value="old('email', $user->email)" required autocomplete="email" />
+            <x-input.error class="mt-2" :messages="$errors->get('email')" />
 
             @if ($user instanceof \Illuminate\Contracts\Auth\MustVerifyEmail && !$user->hasVerifiedEmail())
                 <div>
@@ -47,9 +47,9 @@
         </div>
 
         <div class="flex items-center gap-4">
-            <x-submit-button>
+            <x-button.submit>
                 {{ Lang::get('profile.actions.save') }}
-            </x-submit-button>
+            </x-button.submit>
 
             @if (session('status') === 'profile-updated')
                 <p x-data="{ show: true }"
diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php
index bc26ca7..c2bb5fc 100644
--- a/resources/views/vendor/passport/authorize.blade.php
+++ b/resources/views/vendor/passport/authorize.blade.php
@@ -50,9 +50,9 @@
                     <input type="hidden" name="state" value="{{ $request->state }}">
                     <input type="hidden" name="client_id" value="{{ $client->getKey() }}">
                     <input type="hidden" name="auth_token" value="{{ $authToken }}">
-                    <x-submit-button>
+                    <x-button.submit>
                         {{ Lang::get('auth.authorization-request.authorize') }}
-                    </x-submit-button>
+                    </x-button.submit>
                 </form>
             </div>
         </div>