diff --git a/demos/complex_inputs/app.jl b/demos/complex_inputs/app.jl
index 6930cd7d..3dbfd814 100644
--- a/demos/complex_inputs/app.jl
+++ b/demos/complex_inputs/app.jl
@@ -8,6 +8,7 @@ using GenieFramework
     @out start_date_has_errors = false
     @in end_date = today() + Day(7)
     @out end_date_has_errors = false
+    @in start_time = Dates.Time(now())
 
     @onchange start_date begin
       if start_date < today()
@@ -54,26 +55,37 @@ using GenieFramework
         notify(__model__, "End date saved", :positive)
       end
     end
+
+    @onchange start_time begin
+      notify(__model__, "Start time saved", :positive)
+    end
 end
 
 ui() = begin
-  [
-    row(style="max-width: 400px") do
-      cell() do
-        heading("Date range picker demo")
+  row(style="max-width: 400px") do
+    cell() do; [
+      row() do
+        cell() do
+          heading("Date range picker demo")
+        end
       end
-    end
-    row(style="max-width: 400px") do
-      cell() do
-        datefield("Start date", :start_date, datepicker_props = Dict(:todaybtn => true, :nounset => true), textfield_props = Dict(:bgcolor => "green-1"))
+      row() do
+        cell() do
+          datefield("Start date", :start_date, datepicker_props = Dict(:todaybtn => true, :nounset => true), textfield_props = Dict(:bgcolor => "green-1"))
+        end
       end
-    end
-    row(style="max-width: 400px") do
-      cell() do
-        datefield("End date", :end_date, datepicker_props = Dict(:nounset => true), icon_props = Dict(:color => "red-10"), textfield_props = Dict(:dense => true, :square => true))
+      row() do
+        cell() do
+          datefield("End date", :end_date, datepicker_props = Dict(:nounset => true), icon_props = Dict(:color => "red-10"), textfield_props = Dict(:dense => true, :square => true))
+        end
       end
-    end
-  ]
+      row() do
+        cell() do
+          timefield("Start time", :start_time, timepicker_props = Dict(:nowbtn => true, :nounset => true, :format24h => true, :withseconds => true), textfield_props = Dict(:bgcolor => "blue-1"))
+        end
+      end
+    ];end
+  end
 end
 
 @page("/", ui)
\ No newline at end of file
diff --git a/src/FormInputs.jl b/src/FormInputs.jl
index 41a4e238..6ec82b4f 100644
--- a/src/FormInputs.jl
+++ b/src/FormInputs.jl
@@ -3,7 +3,7 @@ module FormInputs
 using Genie, Stipple, StippleUI, StippleUI.API
 import Genie.Renderer.Html: HTMLString, normal_element, template, register_normal_element
 
-export textfield, numberfield, textarea, filefield, datefield
+export textfield, numberfield, textarea, filefield, datefield, timefield
 
 register_normal_element("q__input", context = @__MODULE__)
 register_normal_element("q__file", context = @__MODULE__)
@@ -153,12 +153,17 @@ end
 """
     datefield(args...; kwargs...)
 
-Complex input type that combines a textfield with an icon, a datepicker and a popup proxy.
+Complex input type that combines a textfield with an icon, a datepicker and a popup.
 The datepicker is hidden by default and is shown when the icon is clicked.
-The popup proxy is used to hide the datepicker when the user clicks outside of it.
-A number of common arguments are defined and are passed to the textfield, the icon, the popup proxy and the datepicker.
+The popup is used to hide the datepicker when the user clicks outside of it.
+A number of common arguments are defined and are passed to the textfield, the icon, the popup and the datepicker.
 In addition, keyword arguments can be passed to each of these components individually by using the `textfield_props`,
 `icon_props`, `popup_proxy_props` and `datepicker_props` keyword arguments.
+
+# Examples
+```julia
+datefield("Start date", :start_date, datepicker_props = Dict(:todaybtn => true, :nounset => true), textfield_props = Dict(:bgcolor => "green-1"))
+```
 """
 function datefield( label::Union{String,Symbol} = "",
                     fieldname::Union{Symbol,Nothing} = nothing;
@@ -176,14 +181,47 @@ function datefield( label::Union{String,Symbol} = "",
   textfield(label, fieldname, [
     icon([
       popup_proxy([
-          datepicker(fieldname; mask = mask, kw(datepicker_props)...)
-        ];
-        cover = true, transitionshow = transitionshow, transitionhide = transitionhide, kw(popup_proxy_props)...
-      )];
-      name = icon_name, class = icon_class, style = icon_style, kw(icon_props)...
-    )];
-    clearable = true, filled = true, kw(textfield_props)..., kwargs...
-  )
+        datepicker(fieldname; mask = mask, kw(datepicker_props)...)
+      ]; cover = true, transitionshow = transitionshow, transitionhide = transitionhide, kw(popup_proxy_props)...)
+    ]; name = icon_name, class = icon_class, style = icon_style, kw(icon_props)...)
+  ]; clearable = true, filled = true, kw(textfield_props)..., kwargs...)
+end
+
+"""
+    timefield(args...; kwargs...)
+
+Complex input type that combines a textfield with an icon, a timepicker and a popup.
+The timepicker is hidden by default and is shown when the icon is clicked.
+The popup is used to hide the timepicker when the user clicks outside of it.
+A number of common arguments are defined and are passed to the textfield, the icon, the popup and the timepicker.
+In addition, keyword arguments can be passed to each of these components individually by using the `textfield_props`,
+`icon_props`, `popup_proxy_props` and `timepicker_props` keyword arguments.
+
+# Examples
+```julia
+
+```
+"""
+function timefield( label::Union{String,Symbol} = "",
+                    fieldname::Union{Symbol,Nothing} = nothing;
+                    icon_name::Union{Symbol,String,Nothing} = "alarm",
+                    icon_class::Union{Symbol,String,Nothing} = "cursor-pointer",
+                    icon_style::Union{Symbol,String,Nothing} = "height: 100%;",
+                    transitionshow::Union{Symbol,String,Nothing} = "scale",
+                    transitionhide::Union{Symbol,String,Nothing} = "scale",
+                    mask::Union{String,Nothing} = "HH:mm:ss",
+                    textfield_props::Dict = Dict(),
+                    icon_props::Dict = Dict(),
+                    popup_proxy_props::Dict = Dict(),
+                    timepicker_props::Dict = Dict(),
+                    kwargs...)
+  textfield(label, fieldname, [
+    icon([
+      popup_proxy([
+        timepicker(fieldname; mask = mask, kw(timepicker_props)...)
+      ]; cover = true, transitionshow = transitionshow, transitionhide = transitionhide, kw(popup_proxy_props)...)
+    ]; name = icon_name, class = icon_class, style = icon_style, kw(icon_props)...)
+  ]; clearable = true, filled = true, kw(textfield_props)..., kwargs...)
 end
 
 end
diff --git a/src/TimePickers.jl b/src/TimePickers.jl
index e5c8777d..51e0edb3 100644
--- a/src/TimePickers.jl
+++ b/src/TimePickers.jl
@@ -13,7 +13,7 @@ register_normal_element("q__time", context= @__MODULE__)
     tabpanelgroup(args...; kwargs...)
 
 The `timepicker` component provides a method to input time.
-  
+
 ----------
 # Examples
 ----------