diff --git a/.gitignore b/.gitignore
index f18b445..33caefd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,49 @@
-.idea
-.phpunit.cache
-build
+# Composer Related
 composer.lock
-coverage
-docs
+/vendor
+
+# Frontend Assets
+/node_modules
+
+# Logs
+npm-debug.log
+yarn-error.log
+
+# Caches
+.phpunit.cache
+.phpunit.result.cache
+/build
+
+# IDE Helper
+_ide_helper.php
+_ide_helper_models.php
+.phpstorm.meta.php
+
+# Editors
+/.idea
+/.fleet
+/.vscode
+
+# Misc
 phpunit.xml
 phpstan.neon
 testbench.yaml
-node_modules
+/docs
+/coverage
+build
+coverage
+docs
 /.phpunit.cache
-/node_modules
-/public/hot
-/public/storage
-/storage/*.key
-/vendor
 .env
 .env.backup
 .env.production
-.phpunit.result.cache
-.editorconfig
 Homestead.json
 Homestead.yaml
 auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
-/.idea
-/.vscode
 .user.ini
 php.ini
 error_log
 .DS_Store
+/.DS_Store
+/storage/**/*
 .php-cs-fixer.cache
diff --git a/composer.json b/composer.json
index 0ce5e37..ad08917 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^8.3||^8.2",
+        "php": "^8.3",
         "spatie/laravel-package-tools": "^1.16",
         "illuminate/contracts": "^10.0||^11.0||^12.0"
     },
@@ -28,7 +28,9 @@
         "orchestra/testbench": "^10.2||^9.0.0||^8.22.0",
         "pestphp/pest": "^3.0||^2.34",
         "pestphp/pest-plugin-arch": "^3.0||^2.7",
-        "pestphp/pest-plugin-laravel": "^3.2||^2.3"
+        "pestphp/pest-plugin-laravel": "^3.2||^2.3",
+        "rector/rector": "^2.0",
+        "driftingly/rector-laravel": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/rector.php b/rector.php
new file mode 100644
index 0000000..070a210
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Caching\ValueObject\Storage\FileCacheStorage;
+use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\SetList;
+use Rector\ValueObject\PhpVersion;
+use RectorLaravel\Set\LaravelLevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    // Paths to analyze
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/config',
+        __DIR__.'/database',
+        __DIR__.'/resources',
+        __DIR__.'/storage',
+        __DIR__.'/tests',
+    ]);
+
+    // Skip specific rules
+    $rectorConfig->skip([
+        CompactToVariablesRector::class,
+    ]);
+
+    // Enable caching for Rector
+    $rectorConfig->cacheDirectory(__DIR__.'/storage/rector');
+    $rectorConfig->cacheClass(FileCacheStorage::class);
+
+    // Apply sets for Laravel and general code quality
+    $rectorConfig->sets([
+        LaravelLevelSetList::UP_TO_LARAVEL_110,
+        SetList::TYPE_DECLARATION,
+        SetList::PRIVATIZATION,
+        SetList::CODE_QUALITY,
+        SetList::CODING_STYLE,
+        SetList::EARLY_RETURN,
+        SetList::INSTANCEOF,
+        SetList::DEAD_CODE,
+        SetList::NAMING,
+        SetList::PHP_84,
+    ]);
+
+    // Define PHP version for Rector
+    $rectorConfig->phpVersion(PhpVersion::PHP_84);
+};
diff --git a/resources/views/components/buttons/fake-button.blade.php b/resources/views/components/buttons/fake-button.blade.php
index 5e7c922..b90894d 100644
--- a/resources/views/components/buttons/fake-button.blade.php
+++ b/resources/views/components/buttons/fake-button.blade.php
@@ -1,3 +1,3 @@
-<button class="bg-red-500 hover:bg-red-700 text-white text-md font-bold py-2 px-4 rounded-lg hidden">
+<button class="bg-alt-500 hover:bg-alt-700 text-white text-md font-bold py-2 px-4 rounded-lg hidden">
     {{ $buttonText }}
 </button>
diff --git a/resources/views/components/buttons/location-button.blade.php b/resources/views/components/buttons/location-button.blade.php
index 9e9ff7c..b5b9c1a 100644
--- a/resources/views/components/buttons/location-button.blade.php
+++ b/resources/views/components/buttons/location-button.blade.php
@@ -2,6 +2,6 @@
        class="sr-only peer" wire:model="location">
 
 <label for="location_{{ $location }}"
-       class="bg-gray-500 text-white font-bold text-md py-4 px-3 cursor-pointer hover:bg-blue-500 peer-checked:bg-blue-700 rounded-lg">
+       class="bg-gray-500 text-white font-bold text-md py-2 px-3 cursor-pointer hover:bg-gray-700 peer-checked:bg-gray-700 rounded-lg">
     {{ ucfirst($location) }}
 </label>
diff --git a/resources/views/components/buttons/next-button.blade.php b/resources/views/components/buttons/next-button.blade.php
index 567e37f..52a893c 100644
--- a/resources/views/components/buttons/next-button.blade.php
+++ b/resources/views/components/buttons/next-button.blade.php
@@ -1,4 +1,4 @@
 <button wire:click="nextStep"
-        class="bg-red-500 hover:bg-red-700 text-white text-md font-bold py-2 px-4 rounded-lg">
+        class="bg-prime-500 hover:bg-prime-700 text-white text-md font-bold py-2 px-4 rounded-lg">
     {{ $buttonText }}
 </button>
diff --git a/resources/views/components/buttons/submit-button.blade.php b/resources/views/components/buttons/submit-button.blade.php
index 20a7946..2a07330 100644
--- a/resources/views/components/buttons/submit-button.blade.php
+++ b/resources/views/components/buttons/submit-button.blade.php
@@ -1,6 +1,6 @@
 <button wire:click="nextStep"
         wire:loading.attr="disabled"
-        class="bg-red-500 hover:bg-red-700 text-white text-md font-bold py-2 px-4 rounded-lg disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center">
+        class="bg-prime-500 hover:bg-prime-700 text-white text-md font-bold py-2 px-4 rounded-lg disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center">
     <svg wire:loading wire:target="nextStep" class="animate-spin -ml-1 mr-2 h-4 w-4 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
         <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
         <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
diff --git a/resources/views/components/thank-you.blade.php b/resources/views/components/thank-you.blade.php
index 67b0cf4..98997ad 100644
--- a/resources/views/components/thank-you.blade.php
+++ b/resources/views/components/thank-you.blade.php
@@ -1,16 +1,16 @@
 <x-sabhero-wrapper::layouts.app>
-    <div class="flex h-screen prose text-center justify-center mx-auto text-black items-center">
+    <div class="flex h-screen prose dark:prose-invert text-center justify-center mx-auto text-black dark:text-white items-center">
         @if(session('status') === 'success')
-            <div class="alert alert-success">
-                <h1>🎉🏠<br /><br />
+            <div class="alert alert-success dark:bg-green-900 dark:text-green-100">
+                <h1 class="text-black dark:text-white">🎉🏠<br /><br />
                     {{ session('message', 'Form submitted successfully!') }}
                 </h1>
             </div>
         @endif
 
         @if(session('status') === 'failure')
-            <div class="alert alert-danger">
-                <h1>❌🚫<br /><br />
+            <div class="alert alert-danger dark:bg-red-900 dark:text-red-100">
+                <h1 class="text-black dark:text-white">❌🚫<br /><br />
                     {{ session('message', 'There was an issue submitting the form.') }}
                 </h1>
             </div>