diff --git a/lib/comfy_bootstrap_form/bootstrap_options.rb b/lib/comfy_bootstrap_form/bootstrap_options.rb
index 057421f..54481df 100644
--- a/lib/comfy_bootstrap_form/bootstrap_options.rb
+++ b/lib/comfy_bootstrap_form/bootstrap_options.rb
@@ -74,6 +74,9 @@ class BootstrapOptions
     #   form.text_field :foo, bootstrap: {error: "Error Message"}
     #
     attr_accessor :error
+    
+    # Use Bootstrap 5 floating labels
+    attr_accessor :floating
 
     def initialize(options = {})
       set_defaults
@@ -132,7 +135,8 @@ def set_defaults
       @help                 = nil
       @error                = nil
       @check_inline         = false
-      @custom_control       = true
+      @custom_control       = false
+      @floating             = false
     end
 
   end
diff --git a/lib/comfy_bootstrap_form/form_builder.rb b/lib/comfy_bootstrap_form/form_builder.rb
index d0bec68..d566ed5 100644
--- a/lib/comfy_bootstrap_form/form_builder.rb
+++ b/lib/comfy_bootstrap_form/form_builder.rb
@@ -92,7 +92,7 @@ def select(method, choices = nil, options = {}, html_options = {}, &block)
 
       add_css_class!(html_options, "custom-select") if bootstrap.custom_control
 
-      draw_form_group(bootstrap, method, html_options) do
+      draw_form_group(bootstrap, method, html_options, true) do
         super(method, choices, options, html_options, &block)
       end
     end
@@ -107,7 +107,7 @@ def collection_select(method, collection, value_method, text_method, options = {
 
       add_css_class!(html_options, "custom-select") if bootstrap.custom_control
 
-      draw_form_group(bootstrap, method, html_options) do
+      draw_form_group(bootstrap, method, html_options, true) do
         super(method, collection, value_method, text_method, options, html_options)
       end
     end
@@ -122,7 +122,8 @@ def file_field(method, options = {})
 
       draw_form_group(bootstrap, method, options) do
         if bootstrap.custom_control
-          content_tag(:div, class: "custom-file") do
+          content_tag(:div, class: "custom-file") do      form_group_class += " form-floating" if bootstrap.floating?
+
             add_css_class!(options, "custom-file-input")
             remove_css_class!(options, "form-control")
             label_text = options.delete(:placeholder)
@@ -370,21 +371,27 @@ def form_group(options = {})
   private
 
     # form group wrapper for input fields
-    def draw_form_group(bootstrap, method, options)
+    def draw_form_group(bootstrap, method, options, select = false)
       label  = draw_label(bootstrap, method, for_attr: options[:id])
       errors = draw_errors(bootstrap, method)
 
-      control = draw_control(bootstrap, errors, method, options) do
+      control = draw_control(bootstrap, errors, method, options, select) do
         yield
       end
 
       form_group_class = "form-group"
-      form_group_class += " row"      if bootstrap.horizontal?
-      form_group_class += " mr-sm-2"  if bootstrap.inline?
+      form_group_class += " row"           if bootstrap.horizontal?
+      form_group_class += " mr-sm-2"       if bootstrap.inline?
+      form_group_class += " form-floating" if bootstrap.floating
 
       content_tag(:div, class: form_group_class) do
-        concat label
-        concat control
+        if bootstrap.floating
+          concat control
+          concat label
+        else
+          concat label
+          concat control
+        end
       end
     end
 
@@ -445,8 +452,9 @@ def draw_label(bootstrap, method, for_attr: nil)
     end
 
     # Renders control for a given field
-    def draw_control(bootstrap, errors, _method, options)
-      add_css_class!(options, "form-control")
+    def draw_control(bootstrap, errors, _method, options, select)
+      add_css_class!(options, "form-control") unless select
+      add_css_class!(options, "form-select") if select
       add_css_class!(options, "is-invalid") if errors.present?
 
       draw_control_column(bootstrap, offset: bootstrap.label[:hide]) do
diff --git a/lib/comfy_bootstrap_form/version.rb b/lib/comfy_bootstrap_form/version.rb
index 757bf54..44e3579 100644
--- a/lib/comfy_bootstrap_form/version.rb
+++ b/lib/comfy_bootstrap_form/version.rb
@@ -2,6 +2,6 @@
 
 module ComfyBootstrapForm
 
-  VERSION = "4.0.9"
+  VERSION = "4.0.14"
 
 end