diff --git a/README.md b/README.md
index 3c16edf..1c29a19 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
-# Bootstrap theme for Aire 
+# Bootstrap 5 theme for Aire 
 
  - https://github.com/glhd/aire
- - https://glhd.github.io/aire/bootstrap
 
 ## Installation
 Install via composer with:
 
 ```
-composer require glhd/aire-bootstrap
+composer require glhd/aire miteyema/aire-bootstrap5
 ```
diff --git a/composer.json b/composer.json
index 1e6b33b..96a0052 100755
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
-  "name": "glhd/aire-bootstrap",
-  "description": "Bootstrap themes for Aire",
+  "name": "miteyema/aire-bootstrap5",
+  "description": "Bootstrap 5 themes for Aire",
   "keywords": [
     "laravel",
     "forms",
@@ -11,13 +11,17 @@
     {
       "name": "Chris Morrell",
       "homepage": "http://www.cmorrell.com"
+    },
+    {
+      "name": "Tim Ameye",
+      "homepage": "http://shiftlock.io"
     }
   ],
   "license": "MIT",
   "require": {
     "php": ">=7.1",
     "glhd/aire": "^2.0",
-    "illuminate/support": "^5.7|^6.0|^7.0|^8.0|^9.0|^10.0"
+    "illuminate/support": "^5.7|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
   },
   "require-dev": {
     "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0",
@@ -41,7 +45,7 @@
       "Galahad\\AireBootstrap\\Tests\\": "tests/"
     }
   },
-  "minimum-stability": "stable",
+  "minimum-stability": "dev",
   "extra": {
     "laravel": {
       "providers": [
diff --git a/src/AireBootstrapServiceProvider.php b/src/AireBootstrapServiceProvider.php
index 823735f..38ab8cb 100644
--- a/src/AireBootstrapServiceProvider.php
+++ b/src/AireBootstrapServiceProvider.php
@@ -26,11 +26,11 @@ public function boot()
                 'group_append' => 'input-group-append',
                 'group_help_text' => 'form-text text-muted',
                 'group_errors' => '',
-                'label' => '',
+                'label' => 'form-label',
                 'input' => 'form-control',
 
-                'checkbox' => 'custom-control-input',
-                'checkbox_label' => 'custom-control-label',
+                'checkbox' => 'form-check-input',
+                'checkbox_label' => 'form-check-label',
                 'checkbox_wrapper' => 'custom-control custom-checkbox',
 
                 'checkbox_group' => 'custom-control-input',
@@ -147,10 +147,6 @@ public function boot()
             $input->attributes->registerMutator('class', function (ClassNames $classNames) use ($input) {
 
                 if ('file' === $input->attributes->get('type')) {
-                    $classNames
-                        ->remove('form-control')
-                        ->add('custom-file-input');
-
                     $input
                         ->groupAddClass('custom-file')
                         ->groupRemoveClass('form-group');
diff --git a/views/group/input/file.blade.php b/views/group/input/file.blade.php
index c30dca0..88e51a1 100644
--- a/views/group/input/file.blade.php
+++ b/views/group/input/file.blade.php
@@ -14,8 +14,8 @@
             @endif
     
             <div class="custom-file">
-                {{ $element }}
                 {{ $label }}
+                {{ $element }}
             </div>
             
             @if($append)