diff --git a/resources/views/admin/machines/create.blade.php b/resources/views/admin/machines/create.blade.php
index d826537..07c641b 100644
--- a/resources/views/admin/machines/create.blade.php
+++ b/resources/views/admin/machines/create.blade.php
@@ -2,26 +2,26 @@
 
 @section('content')
 <div class="container mx-auto px-6 py-8">
-    <h3 class="text-gray-900 dark:text-gray-300 text-3xl font-medium">{{ __('Create Machine') }}</h3>
+    <h3 class="text-slate-900 dark:text-white text-3xl font-black tracking-tight font-display">{{ __('Create Machine') }}</h3>
 
     <div class="mt-8">
         <form action="{{ route('admin.machines.store') }}" method="POST" class="bg-white dark:bg-gray-800 rounded-lg shadow-xl overflow-hidden p-6 space-y-6">
             @csrf
 
             <div>
-                <label for="name" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Machine Name') }}</label>
+                <label for="name" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Machine Name') }}</label>
                 <input type="text" name="name" id="name" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" required>
                 @error('name') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="location" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Location') }}</label>
+                <label for="location" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Location') }}</label>
                 <input type="text" name="location" id="location" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('location') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="status" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Status') }}</label>
+                <label for="status" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Status') }}</label>
                 <select name="status" id="status" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                     <option value="offline">{{ __('Offline') }}</option>
                     <option value="online">{{ __('Connecting...') }}</option>
@@ -31,13 +31,13 @@
             </div>
 
             <div>
-                <label for="temperature" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Temperature') }} (°C)</label>
+                <label for="temperature" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Temperature') }} (°C)</label>
                 <input type="number" step="0.1" name="temperature" id="temperature" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('temperature') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="firmware_version" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Firmware Version') }}</label>
+                <label for="firmware_version" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Firmware Version') }}</label>
                 <input type="text" name="firmware_version" id="firmware_version" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('firmware_version') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
diff --git a/resources/views/admin/machines/edit.blade.php b/resources/views/admin/machines/edit.blade.php
index 2d1c697..96cccf0 100644
--- a/resources/views/admin/machines/edit.blade.php
+++ b/resources/views/admin/machines/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 <div class="container mx-auto px-6 py-8">
-    <h3 class="text-gray-900 dark:text-gray-300 text-3xl font-medium">{{ __('Edit Machine') }}</h3>
+    <h3 class="text-slate-900 dark:text-white text-3xl font-black tracking-tight font-display">{{ __('Edit Machine') }}</h3>
 
     <div class="mt-8">
         <form action="{{ route('admin.machines.update', $machine) }}" method="POST" class="bg-white dark:bg-gray-800 rounded-lg shadow-xl overflow-hidden p-6 space-y-6">
@@ -10,19 +10,19 @@
             @method('PUT')
 
             <div>
-                <label for="name" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Machine Name') }}</label>
+                <label for="name" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Machine Name') }}</label>
                 <input type="text" name="name" id="name" value="{{ old('name', $machine->name) }}" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" required>
                 @error('name') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="location" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Location') }}</label>
+                <label for="location" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Location') }}</label>
                 <input type="text" name="location" id="location" value="{{ old('location', $machine->location) }}" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('location') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="status" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Status') }}</label>
+                <label for="status" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Status') }}</label>
                 <select name="status" id="status" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                     <option value="offline" {{ $machine->status == 'offline' ? 'selected' : '' }}>{{ __('Offline') }}</option>
                     <option value="online" {{ $machine->status == 'online' ? 'selected' : '' }}>{{ __('Connecting...') }}</option>
@@ -32,13 +32,13 @@
             </div>
 
             <div>
-                <label for="temperature" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Temperature') }} (°C)</label>
+                <label for="temperature" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Temperature') }} (°C)</label>
                 <input type="number" step="0.1" name="temperature" id="temperature" value="{{ old('temperature', $machine->temperature) }}" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('temperature') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>
 
             <div>
-                <label for="firmware_version" class="block text-sm font-medium text-gray-700 dark:text-gray-400">{{ __('Firmware Version') }}</label>
+                <label for="firmware_version" class="block text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest mb-2">{{ __('Firmware Version') }}</label>
                 <input type="text" name="firmware_version" id="firmware_version" value="{{ old('firmware_version', $machine->firmware_version) }}" class="mt-1 block w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm py-2 px-3 text-gray-900 dark:text-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                 @error('firmware_version') <span class="text-red-500 text-sm">{{ $message }}</span> @enderror
             </div>